packages: sysstat/sysstat.init - cosmetics

[glen]

Author: glen                         Date: Fri Nov 13 18:07:37 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cosmetics

---- Files affected:
packages/sysstat:
   sysstat.init (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: packages/sysstat/sysstat.init
diff -u packages/sysstat/sysstat.init:1.13 packages/sysstat/sysstat.init:1.14
--- packages/sysstat/sysstat.init:1.13	Tue Nov  4 21:47:09 2008
+++ packages/sysstat/sysstat.init	Fri Nov 13 19:07:32 2009
@@ -15,35 +15,38 @@
 
 start() {
 	# Check if the service is already running?
-	if [ ! -f /var/lock/subsys/sysstat ]; then
-		msg_starting "system activity data collector"
-		daemon /usr/lib/sa/sadc $SADC_OPTIONS -
-		RETVAL=$?
-		[ "$RETVAL" -eq 0 ] && touch /var/lock/subsys/sysstat
-	else
-		msg_already_running "system activity data collector"
+	if [ -f /var/lock/subsys/sysstat ]; then
+		msg_already_running "System Activity Data Collector"
+		return
 	fi
+
+	msg_starting "System Activity Data Collector"
+	daemon /usr/lib/sa/sadc $SADC_OPTIONS -
+	RETVAL=$?
+	[ "$RETVAL" -eq 0 ] && touch /var/lock/subsys/sysstat
 }
 
 stop() {
-	if [ -f /var/lock/subsys/sysstat ]; then
-		# Stop daemons.
-		msg_stopping "system activity data collector"
-		ok
-		rm -f /var/lock/subsys/sysstat >/dev/null 2>&1
-	else
-		msg_not_running "system activity data collector"
+	if [ ! -f /var/lock/subsys/sysstat ]; then
+		msg_not_running "System Activity Data Collector"
+		return
 	fi
+
+	# Stop daemons.
+	msg_stopping "System Activity Data Collector"
+	ok
+	rm -f /var/lock/subsys/sysstat >/dev/null 2>&1
 }
 
 condrestart() {
-	if [ -f /var/lock/subsys/sysstat ]; then
-		stop
-		start
-	else
-		msg_not_running "system activity data collector"
+	if [ ! -f /var/lock/subsys/sysstat ]; then
+		msg_not_running "System Activity Data Collector"
 		RETVAL=$1
+		return
 	fi
+
+	stop
+	start
 }
 
 RETVAL=0
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sysstat/sysstat.init?r1=1.13&r2=1.14&f=u