SOURCES: tor.init - use functions

[glen]

Author: glen                         Date: Thu Oct 19 10:35:52 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use functions

---- Files affected:
SOURCES:
   tor.init (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/tor.init
diff -u SOURCES/tor.init:1.2 SOURCES/tor.init:1.3
--- SOURCES/tor.init:1.2	Sun Sep 17 18:17:31 2006
+++ SOURCES/tor.init	Thu Oct 19 12:35:47 2006
@@ -28,8 +28,7 @@
 	exit 0
 fi
 
-case "$1" in
-  start)
+start() {
 	if [ ! -f /var/lock/subsys/tor ]; then
 		msg_starting tor
 		daemon tor --user $TOR_USER --group $TOR_GROUP \
@@ -39,8 +38,9 @@
 	else
 		msg_already_running tor
 	fi
-	;;
-  stop)
+}
+
+stop() {
 	if [ -f /var/lock/subsys/tor ]; then
 		msg_stopping tor
 		killproc --pidfile /var/run/tor.pid tor
@@ -48,13 +48,21 @@
 	else
 		msg_not_running tor
 	fi
+}
+
+RETVAL=0
+case "$1" in
+  start)
+  	start
+	;;
+  stop)
+  	stop
 	;;
   restart)
-	$0 stop
-	$0 start
-	exit $?
+	stop
+	start
 	;;
-  reload)
+  reload|force-reload)
 	if [ -f /var/lock/subsys/tor ]; then
 		msg_reloading tor
 		killproc tor -HUP
@@ -64,11 +72,6 @@
 		RETVAL=7
 	fi
 	;;
-  force-reload)
-	# if program allows reloading without stopping
-	$0 reload
-	exit $?
-	;;
   status)
 	status tor
 	RETVAL=$?
@@ -79,6 +82,3 @@
 esac
 
 exit $RETVAL
-
-# This must be last line !
-# vi:syntax=sh:ts=8:sw=4
================================================================

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