SOURCES: jabberd14.init - use functions

glen glen at pld-linux.org
Mon Jul 16 16:49:52 CEST 2007


Author: glen                         Date: Mon Jul 16 14:49:51 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use functions

---- Files affected:
SOURCES:
   jabberd14.init (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SOURCES/jabberd14.init
diff -u SOURCES/jabberd14.init:1.6 SOURCES/jabberd14.init:1.7
--- SOURCES/jabberd14.init:1.6	Thu Dec  8 02:02:49 2005
+++ SOURCES/jabberd14.init	Mon Jul 16 16:49:46 2007
@@ -27,9 +27,7 @@
 	exit 0
 fi
 
-RETVAL=0
-case "$1" in
-  start)
+start() {
 	if [ ! -f /var/lock/subsys/jabberd14 ]; then
 		msg_starting "Jabber server"
 		daemon jabberd14 -c /etc/jabber/jabberd14.xml -B -U jabber -G jabber
@@ -38,8 +36,9 @@
 	else
 		msg_already_running "Jabber server"
 	fi
-	;;
-  stop)
+}
+
+stop() {
 	if [ -f /var/lock/subsys/jabberd14 ]; then
 		msg_stopping "Jabber server"
 		killproc jabberd14
@@ -47,11 +46,19 @@
 	else
 		msg_not_running "Jabber server"
 	fi
+}
+
+RETVAL=0
+case "$1" in
+  start)
+  	start
+	;;
+  stop)
+  	stop
 	;;
   restart)
-	$0 stop
-	$0 start
-	exit $?
+	stop
+	start
 	;;
   reload|force-reload)
 	if [ -f /var/lock/subsys/jabberd14 ]; then
@@ -59,7 +66,7 @@
 		killproc jabberd14 -HUP
 		RETVAL=$?
 	else
-		msg_not_running "Jabber server" >&2
+		msg_not_running "Jabber server"
 		exit 7
 	fi
 	;;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/jabberd14.init?r1=1.6&r2=1.7&f=u



More information about the pld-cvs-commit mailing list