SVN: rc-scripts/trunk/rc.d/init.d/template.init

[glen]

Author: glen
Date: Wed Feb 25 08:43:03 2009
New Revision: 10146

Modified:
   rc-scripts/trunk/rc.d/init.d/template.init
Log:
- less indent by using return in functions

Modified: rc-scripts/trunk/rc.d/init.d/template.init
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/template.init	(original)
+++ rc-scripts/trunk/rc.d/init.d/template.init	Wed Feb 25 08:43:03 2009
@@ -39,48 +39,52 @@
 
 start() {
 	# Check if the service is already running?
-	if [ ! -f /var/lock/subsys/<service> ]; then
-		msg_starting <service>
-		daemon /usr/sbin/<service>
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/<service>
-	else
+	if [ -f /var/lock/subsys/<service> ]; then
 		msg_already_running <service>
+		return
 	fi
+
+	msg_starting <service>
+	daemon /usr/sbin/<service>
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/<service>
 }
 
 stop() {
-	if [ -f /var/lock/subsys/<service> ]; then
-		# Stop daemons.
-		msg_stopping <service>
-		killproc <service>
-		killproc --pidfile /var/run/<service>.pid <service> -TERM
-		rm -f /var/lock/subsys/<service>
-	else
+	if [ ! -f /var/lock/subsys/<service> ]; then
 		msg_not_running <service>
+		return
 	fi
+
+	# Stop daemons.
+	msg_stopping <service>
+	killproc <service>
+	killproc --pidfile /var/run/<service>.pid <service> -TERM
+	rm -f /var/lock/subsys/<service>
 }
 
 reload() {
-	if [ -f /var/lock/subsys/<service> ]; then
-		msg_reloading <service>
-		killproc <service> -HUP
-		killproc --pidfile /var/run/<service>.pid <service> -HUP
-		RETVAL=$?
-	else
+	if [ ! -f /var/lock/subsys/<service> ]; then
 		msg_not_running <service>
 		RETVAL=7
+		return
 	fi
+
+	msg_reloading <service>
+	killproc <service> -HUP
+	killproc --pidfile /var/run/<service>.pid <service> -HUP
+	RETVAL=$?
 }
 
 condrestart() {
-	if [ -f /var/lock/subsys/<service> ]; then
-		stop
-		start
-	else
+	if [ ! -f /var/lock/subsys/<service> ]; then
 		msg_not_running <service>
 		RETVAL=$1
+		return
 	fi
+
+	stop
+	start
 }
 
 RETVAL=0