From 07cc70f6748611a168847ce9584a0b60aeb2f77f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 28 Apr 2009 22:51:50 +0000 Subject: [PATCH] - use functions, add try-restart, correct force-reload Changed files: subversion-svnserve.init -> 1.6 --- subversion-svnserve.init | 75 ++++++++++++++++++++++++++-------------- 1 file changed, 49 insertions(+), 26 deletions(-) diff --git a/subversion-svnserve.init b/subversion-svnserve.init index 244ebbe..1cb068f 100644 --- a/subversion-svnserve.init +++ b/subversion-svnserve.init @@ -28,45 +28,68 @@ else 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 -- 2.44.0