SOURCES: sharedance.init - use functions

glen glen at pld-linux.org
Wed Jan 10 20:29:23 CET 2007


Author: glen                         Date: Wed Jan 10 19:29:23 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use functions

---- Files affected:
SOURCES:
   sharedance.init (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/sharedance.init
diff -u SOURCES/sharedance.init:1.1 SOURCES/sharedance.init:1.2
--- SOURCES/sharedance.init:1.1	Wed Jan 10 20:15:08 2007
+++ SOURCES/sharedance.init	Wed Jan 10 20:29:17 2007
@@ -33,9 +33,7 @@
 	exit 0
 fi
 
-# See how we were called.
-case "$1" in
-  start)
+start() {
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/sharedanced ]; then
 		msg_starting sharedanced
@@ -45,8 +43,9 @@
 	else
 		msg_already_running sharedanced
 	fi
-	;;
-  stop)
+}
+
+stop() {
 	if [ -f /var/lock/subsys/sharedanced ]; then
 		# Stop daemons.
 		msg_stopping sharedanced
@@ -55,31 +54,30 @@
 	else
 		msg_not_running sharedanced
 	fi
+}
+
+# See how we were called.
+case "$1" in
+  start)
+  	start
+	;;
+  stop)
+  	stop
 	;;
   restart)
-	$0 stop
-	$0 start
-	exit $?
+	stop
+	start
 	;;
-  reload)
+  reload|force-reload)
 	if [ -f /var/lock/subsys/sharedanced ]; then
 		msg_reloading sharedanced
 		killproc sharedanced -HUP
 		RETVAL=$?
 	else
-		msg_not_running sharedanced >&2
+		msg_not_running sharedanced
 		RETVAL=7
 	fi
 	;;
-  force-reload)
-	# if program allows reloading without stopping
-	$0 reload
-
-	# or if it doesn't
-	$0 restart
-
-	exit $?
-	;;
   status)
 	status sharedanced
 	RETVAL=$?
@@ -90,6 +88,3 @@
 esac
 
 exit $RETVAL
-
-# This must be last line !
-# vi:syntax=sh
================================================================

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



More information about the pld-cvs-commit mailing list