SOURCES: gnokii.smsd.init - use functions

[glen]

Author: glen                         Date: Thu Feb 22 13:03:55 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use functions

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

---- Diffs:

================================================================
Index: SOURCES/gnokii.smsd.init
diff -u SOURCES/gnokii.smsd.init:1.3 SOURCES/gnokii.smsd.init:1.4
--- SOURCES/gnokii.smsd.init:1.3	Thu Feb 22 09:00:47 2007
+++ SOURCES/gnokii.smsd.init	Thu Feb 22 14:03:50 2007
@@ -2,12 +2,12 @@
 #
 # $Id$
 #
-# smsd			smsd 
+# smsd			smsd
 #
 # chkconfig:	345 42 58
 #
 # description:	gnokii smsd daemon
-#	
+#
 
 
 # Source function library
@@ -43,15 +43,11 @@
 	MAXSMS="-s $MAXSMS_IN_DUMB_MODE"
 fi
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
+start() {
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/smsd ]; then
-#		echo "phones: $PHONES"
 		first=yes;
-		for number in $PHONES; do 
+		for number in $PHONES; do
 			msg_starting "smsd (phone $number)"
 			daemon --fork "/usr/sbin/smsd -u $DBUSER -p $DB_PASS -d $DBNAME -c $DBHOST -m $DBTYPE -i $INTERVAL $MAXSMS >/var/log/smsd/smsd_phone_$number 2>&1"
 			if [ $? -ne 0 ]; then
@@ -60,46 +56,42 @@
 		done;
 #		daemon /usr/bin/distccd --daemon --user distcc --log-file /var/log/distcc `for ip in $DISTCC_HOSTS_ALLOW; do echo -n "--allow $ip "; done` $DISTCC_OPTS
 		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/smsd		
+		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/smsd
 	else
 		msg_already_running smsd
 	fi
-	;;
-  stop)
+}
+
+stop() {
 	if [ -f /var/lock/subsys/smsd ]; then
 		msg_stopping smsd
 		killproc smsd
 		rm -f /var/run/smsd.pid /var/lock/subsys/smsd >/dev/null 2>&1
 	else
 		msg_not_running smsd
-	fi	
+	fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+  	start
+	;;
+  stop)
+  	stop
 	;;
   restart)
-	$0 stop
-	$0 start
-	exit $?
+	stop
+	start
 	;;
   status)
 	status smsd
 	exit $?
 	;;
-#  reload|force-reload)
-#	if [ -f /var/lock/subsys/smsd ]; then
-#		msg_reloading smsd
-#		killproc smsd -HUP
-#		RETVAL=$?
-#	else
-#		msg_not_running smsd
-#		exit 7
-#	fi
-#	;;
   *)
 	msg_usage "$0 {start|stop|restart|status}"
 	exit 3
 esac
 
 exit $RETVAL
-
-# This must be last line !
-# vi:syntax=sh:tw=78:ts=8:sw=4
-
================================================================

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