packages: pulseaudio/pulseaudio.init - unify with template.init

[glen]

Author: glen                         Date: Wed Feb 24 21:17:06 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unify with template.init

---- Files affected:
packages/pulseaudio:
   pulseaudio.init (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/pulseaudio/pulseaudio.init
diff -u packages/pulseaudio/pulseaudio.init:1.4 
packages/pulseaudio/pulseaudio.init:1.5
--- packages/pulseaudio/pulseaudio.init:1.4     Wed Feb 24 22:15:02 2010
+++ packages/pulseaudio/pulseaudio.init Wed Feb 24 22:17:01 2010
@@ -28,46 +28,50 @@
 
 start() {
        # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/pulseaudio ]; then
-               msg_starting pulseaudio
-               daemon /usr/bin/pulseaudio --system --daemonize --high-priority 
--log-target=syslog --disallow-module-loading=$DISALLOW_MODULE_LOADING
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/pulseaudio
-       else
-               msg_already_running pulseaudio
+       if [ -f /var/lock/subsys/pulseaudio ]; then
+               msg_already_running "PulseAudio"
+               return
        fi
+
+       msg_starting "PulseAudio"
+       daemon /usr/bin/pulseaudio --system --daemonize --high-priority 
--log-target=syslog --disallow-module-loading=$DISALLOW_MODULE_LOADING
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/pulseaudio
 }
 
 stop() {
-       if [ -f /var/lock/subsys/pulseaudio ]; then
-               # Stop daemons.
-               msg_stopping pulseaudio
-               killproc --pidfile /var/run/pulse/pid pulseaudio -TERM
-               rm -f /var/lock/subsys/pulseaudio
-       else
-               msg_not_running pulseaudio
+       if [ ! -f /var/lock/subsys/pulseaudio ]; then
+               msg_not_running "PulseAudio"
+               return
        fi
+
+       # Stop daemons.
+       msg_stopping "PulseAudio"
+       killproc --pidfile /var/run/pulse/pid pulseaudio -TERM
+       rm -f /var/lock/subsys/pulseaudio
 }
 
 reload() {
-       if [ -f /var/lock/subsys/pulseaudio ]; then
-               msg_reloading pulseaudio
-               killproc --pidfile /var/run/pulse/pid pulseaudio -HUP
-               RETVAL=$?
-       else
-               msg_not_running pulseaudio
+       if [ ! -f /var/lock/subsys/pulseaudio ]; then
+               msg_not_running "PulseAudio"
                RETVAL=7
+               return
        fi
+
+       msg_reloading "PulseAudio"
+       killproc --pidfile /var/run/pulse/pid pulseaudio -HUP
+       RETVAL=$?
 }
 
 condrestart() {
-       if [ -f /var/lock/subsys/pulseaudio ]; then
-               stop
-               start
-       else
-               msg_not_running pulseaudio
+       if [ ! -f /var/lock/subsys/pulseaudio ]; then
+               msg_not_running "PulseAudio"
                RETVAL=$1
+               return
        fi
+
+       stop
+       start
 }
 
 RETVAL=0
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pulseaudio/pulseaudio.init?r1=1.4&r2=1.5&f=u

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit