packages: daemontools/daemontools.init - formatting

[glen]

Author: glen                         Date: Thu Jan 27 23:20:31 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- formatting

---- Files affected:
packages/daemontools:
   daemontools.init (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: packages/daemontools/daemontools.init
diff -u packages/daemontools/daemontools.init:1.22 packages/daemontools/daemontools.init:1.23
--- packages/daemontools/daemontools.init:1.22	Fri Jan 28 00:19:24 2011
+++ packages/daemontools/daemontools.init	Fri Jan 28 00:20:26 2011
@@ -32,51 +32,54 @@
 
 start() {
 	# Check if the service is already running?
-	if [ ! -f /var/lock/subsys/svscan ]; then
-		msg_starting svscan
-		busy
-		# we can't get status report from background job
-		# but we can only do simple file check
-		if [ -w $SVSCAN_DIR ]; then
-			daemon --fork /usr/sbin/svscan $SVSCAN_DIR
-			RETVAL=$?
-		else
-			fail
-			nls "Missing service directory. Create %s first." "$SVSCAN_DIR"
-			RETVAL=1
-		fi
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/svscan
-	else
+	if [ -f /var/lock/subsys/svscan ]; then
 		msg_already_running svscan
+		return
 	fi
+
+	msg_starting svscan
+	busy
+	# we can't get status report from background job
+	# but we can only do simple file check
+	if [ -w $SVSCAN_DIR ]; then
+		daemon --fork /usr/sbin/svscan $SVSCAN_DIR
+		RETVAL=$?
+	else
+		fail
+		nls "Missing service directory. Create %s first." "$SVSCAN_DIR"
+		RETVAL=1
+	fi
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/svscan
 }
 
 stop() {
-	if [ -f /var/lock/subsys/svscan ]; then
-		msg_stopping svscan
-		killproc svscan
-		for s in $SVSCAN_DIR/*{,/log}/run; do
-			if [ -x "$s" ]; then
-				svc="$svc ${s%/run}"
-			fi
-		done
-		if [ "$svc" ]; then
-			svc -d -x $svc
-		fi
-		rm -f /var/run/svscan.pid /var/lock/subsys/svscan >/dev/null 2>&1
-	else
+	if [ ! -f /var/lock/subsys/svscan ]; then
 		msg_not_running svscan
+		return
+	fi
+
+	msg_stopping svscan
+	killproc svscan
+	for s in $SVSCAN_DIR/*{,/log}/run; do
+		if [ -x "$s" ]; then
+			svc="$svc ${s%/run}"
+		fi
+	done
+	if [ "$svc" ]; then
+		svc -d -x $svc
 	fi
+	rm -f /var/run/svscan.pid /var/lock/subsys/svscan >/dev/null 2>&1
 }
 
 condrestart() {
-	if [ -f /var/lock/subsys/svscan ]; then
-		stop
-		start
-	else
+	if [ ! -f /var/lock/subsys/svscan ]; then
 		msg_not_running svscan
 		RETVAL=$1
+		return
 	fi
+
+	stop
+	start
 }
 
 RETVAL=0
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/daemontools/daemontools.init?r1=1.22&r2=1.23&f=u