SOURCES: 3dm2-9650SE.init - pldize

[glen]

Author: glen                         Date: Wed Mar  7 10:13:08 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- pldize

---- Files affected:
SOURCES:
   3dm2-9650SE.init (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/3dm2-9650SE.init
diff -u SOURCES/3dm2-9650SE.init:1.1 SOURCES/3dm2-9650SE.init:1.2
--- SOURCES/3dm2-9650SE.init:1.1	Wed Mar  7 10:15:02 2007
+++ SOURCES/3dm2-9650SE.init	Wed Mar  7 11:13:03 2007
@@ -17,53 +17,62 @@
 
 RETVAL=0
 
-# See how we were called.
-case "$1" in
-  start)
+start() {
   	if [ ! -f /var/lock/subsys/3dm2 ]; then
 	    msg_starting "3DM2 Utility"
 	    start-stop-daemon --start --quiet --exec /usr/sbin/3dm2
 	    RETVAL=$?
-	    if [ $RETVAL -eq 0 ]; then 
-		ok 
-		touch /var/lock/subsys/3dm2
+	    if [ $RETVAL -eq 0 ]; then
+			ok
+			touch /var/lock/subsys/3dm2
 	    else
-		fail
-		RETVAL=1
+			fail
+			RETVAL=1
 	    fi
 	else
 	    msg_already_running "3DM2 Utility"
 	fi
-	;;
-  stop)
+}
+
+stop() {
+	# FIXME: stop should NEVER fail with error code
 	if [ -f /var/lock/subsys/3dm2 ]; then
 	    msg_stopping "3DM2 Utility"
-	    start-stop-daemon --stop --quiet --exec /usr/sbin/3dm2 1> /dev/null
+		# FIXME: spec needs rc-scripts versioned dep for start-stop-daemon (see PLD-doc/BuildRequires.txt)
+	    start-stop-daemon --stop --quiet --exec /usr/sbin/3dm2 > /dev/null
 	    RETVAL=$?
-	    if [ $RETVAL -eq 0 ]; then 
-		ok 
-		rm -f /var/lock/subsys/3dm2
+	    if [ $RETVAL -eq 0 ]; then
+			ok
+			rm -f /var/lock/subsys/3dm2
 	    else
-		fail
-		RETVAL=1
+			fail
+			RETVAL=1
 	    fi
 	else
 	    msg_not_running "3DM2 Utility"
 	fi
+}
+
+# See how we were called.
+case "$1" in
+  start)
+  	start
+	;;
+  stop)
+  	stop
 	;;
   status)
 	status 3dm2
 	RETVAL=$?
 	;;
   restart)
-	$0 stop
+	stop
 	sleep 2
-	$0 start
-	RETVAL=$?
+	start
 	;;
   *)
-	echo "Usage: $0 {start|stop|status|restart}"
-	exit 1
+	msg_usage "$0 {start|stop|status|restart}"
+	exit 3
 esac
 
 exit $RETVAL
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/3dm2-9650SE.init?r1=1.1&r2=1.2&f=u