- use functions

Changed files:
    cyrus-imapd.init -> 1.10

diff --git a/cyrus-imapd.init b/cyrus-imapd.init
index b2f6c0aad03949733ba436305f52f50e0dd3480d..fd4eeb426676950810ffc257199e37c323129934 100644 (file)
--- a/cyrus-imapd.init
+++ b/cyrus-imapd.init
@@ -22,10 +22,7 @@ else
        exit 0
 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/cyrus-imapd ]; then
                msg_starting cyrus-imapd
@@ -40,8 +37,9 @@ case "$1" in
        else
                msg_already_running cyrus-imapd
        fi
-       ;;
-  stop)
+}
+
+stop() {
        # Stop daemons.
        if [ -f /var/lock/subsys/cyrus-imapd ]; then
                msg_stopping cyrus-imapd
@@ -50,11 +48,20 @@ case "$1" in
        else
                msg_not_running cyrus-imapd
        fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
        ;;
   restart|force-reload)
-       $0 stop
-       $0 start
-       RETVAL=$?
+       stop
+       start
        ;;
   status)
        status cyrus-master
@@ -66,6 +73,3 @@ case "$1" in
 esac
 
 exit $RETVAL
-
-# This must be last line !
-# vi:syntax=sh:tw=78:ts=8:sw=4