packages: subversion/subversion-svnserve.init - use functions, add try-rest...

[glen]

Author: glen                         Date: Tue Apr 28 22:51:55 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use functions, add try-restart, correct force-reload

---- Files affected:
packages/subversion:
   subversion-svnserve.init (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/subversion/subversion-svnserve.init
diff -u packages/subversion/subversion-svnserve.init:1.5 packages/subversion/subversion-svnserve.init:1.6
--- packages/subversion/subversion-svnserve.init:1.5	Mon May 12 23:53:40 2008
+++ packages/subversion/subversion-svnserve.init	Wed Apr 29 00:51:50 2009
@@ -28,45 +28,68 @@
 	exit 0
 fi
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
+start() {
 	# Start daemons.
-	if [ ! -f /var/lock/subsys/svnserve ]; then
-		msg_starting svnserve
-		daemon --user svn svnserve ${SVNSERVE_OPTIONS} -r ${SVNSERVE_PATH}
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/svnserve
-	else
+	if [ -f /var/lock/subsys/svnserve ]; then
 		msg_already_running svnserve
+		return
 	fi
-	;;
-  stop)
+
+	msg_starting svnserve
+	daemon --user svn svnserve ${SVNSERVE_OPTIONS} -r ${SVNSERVE_PATH}
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/svnserve
+}
+
+stop() {
 	# Stop daemons.
-	if [ -f /var/lock/subsys/svnserve ]; then
-		msg_stopping svnserve
-		killproc svnserve
-		rm -f /var/lock/subsys/svnserve >/dev/null 2>&1
-	else
+	if [ ! -f /var/lock/subsys/svnserve ]; then
+		msg_not_running svnserve
+		return
+	fi
+
+	msg_stopping svnserve
+	killproc svnserve
+	rm -f /var/lock/subsys/svnserve >/dev/null 2>&1
+}
+
+
+condrestart() {
+	if [ ! -f /var/lock/subsys/svnserve ]; then
 		msg_not_running svnserve
+		RETVAL=$1
+		return
 	fi
+
+	stop
+	start
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+  	start
 	;;
-  restart|force-reload)
-	$0 stop
-	$0 start
-	exit $?
+  stop)
+  	stop
+	;;
+  restart)
+	stop
+	start
+	;;
+  try-restart)
+	condrestart 0
+	;;
+  force-reload)
+	condrestart 7
 	;;
   status)
 	status svnserve
 	exit $?
 	;;
-#  reload)
-#	msg_reloading svnserve
-#	killproc svnserve -HUP
-#	;;
   *)
-	msg_usage "$0 {start|stop|restart|force-reload|status}"
+	msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
 	exit 3
 esac
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/subversion/subversion-svnserve.init?r1=1.5&r2=1.6&f=u