SOURCES: ldirectord.init - use functions

[glen]

Author: glen                         Date: Sat Jan 27 23:52:52 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use functions

---- Files affected:
SOURCES:
   ldirectord.init (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/ldirectord.init
diff -u SOURCES/ldirectord.init:1.3 SOURCES/ldirectord.init:1.4
--- SOURCES/ldirectord.init:1.3	Sat Jan 27 23:21:45 2007
+++ SOURCES/ldirectord.init	Sun Jan 28 00:52:47 2007
@@ -14,9 +14,7 @@
 # Get service config
 [ -f /etc/sysconfig/ldirectord ] && . /etc/sysconfig/ldirectord
 
-RETVAL=0
-case "$1" in
-  start)
+start() {
 	if [ ! -f /var/lock/subsys/ldirectord ]; then
         	msg_starting ldirectord
 		daemon ldirectord start
@@ -25,8 +23,9 @@
 	else
 		msg_already_running ldirectord
 	fi
-	;;
-  stop)
+}
+
+stop() {
 	if [ -f /var/lock/subsys/ldirectord ]; then
 		msg_stopping ldirectord
 		daemon ldirectord stop
@@ -34,17 +33,23 @@
 	else
 		msg_not_running ldirectord
 	fi
+}
+
+RETVAL=0
+case "$1" in
+  start)
+  	start
+	;;
+  stop)
+  	stop
 	;;
   restart)
-  	$0 stop
-	$0 start
+  	stop
+	start
 	;;
   # What is it?
   try-restart)
-        action "Try-Restarting ldirectord" ldirectord try-restart
-	;;
-  status)
-	status ldirectord status
+	action "Try-Restarting ldirectord" ldirectord try-restart
 	;;
   reload|force-reload)
 	if [ -f /var/lock/subsys/ldirectord ]; then
@@ -55,6 +60,11 @@
 		msg_not_running ldirectord
 		RETVAL=7
 	fi
+	;;
+  status)
+  # CHECKME
+	status ldirectord status
+	RETVAL=$?
 	;;
   *)
 	msg_usage "$0 {start|stop|restart|try-restart|status|reload|force-reload}"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/ldirectord.init?r1=1.3&r2=1.4&f=u