- formatting

Changed files:
    cyrus-imapd.init -> 1.14
    cyrus-sync.init -> 1.5

diff --git a/cyrus-imapd.init b/cyrus-imapd.init
index e266ebf6a7bd806b41f3144841243c712f38b803..d8d30c1d1bf37278470e4cd95c8ab76fd04f9e97 100644 (file)
--- a/cyrus-imapd.init
+++ b/cyrus-imapd.init
@@ -26,40 +26,43 @@ fi
 
 start() {
        # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/cyrus-imapd ]; then
-               msg_starting "Cyrus IMAP Daemon"
-               /usr/lib/cyrus/cyrus-master &
-               if ps -C cyrus-master >/dev/null 2>&1; then
-                       RETVAL=$?
-                       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cyrus-imapd
-                       ok
-               else
-                       fail
-               fi
-       else
+       if [ -f /var/lock/subsys/cyrus-imapd ]; then
                msg_already_running "Cyrus IMAPD"
+               return
+       fi
+
+       msg_starting "Cyrus IMAP Daemon"
+       /usr/lib/cyrus/cyrus-master &
+       if ps -C cyrus-master >/dev/null 2>&1; then
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cyrus-imapd
+               ok
+       else
+               fail
        fi
 }
 
 stop() {
        # Stop daemons.
-       if [ -f /var/lock/subsys/cyrus-imapd ]; then
-               msg_stopping "Cyrus IMAP Daemon"
-               killproc cyrus-master
-               rm -f /var/lock/subsys/cyrus-imapd
-       else
+       if [ ! -f /var/lock/subsys/cyrus-imapd ]; then
                msg_not_running "Cyrus IMAP Daemon"
+               return
        fi
+
+       msg_stopping "Cyrus IMAP Daemon"
+       killproc cyrus-master
+       rm -f /var/lock/subsys/cyrus-imapd
 }
 
 condrestart() {
-       if [ -f /var/lock/subsys/cyrus-imapd ]; then
-               stop
-               start
-       else
+       if [ ! -f /var/lock/subsys/cyrus-imapd ]; then
                msg_not_running "Cyrus IMAP Daemon"
                RETVAL=$1
+               return
        fi
+
+       stop
+       start
 }
 
 RETVAL=0

diff --git a/cyrus-sync.init b/cyrus-sync.init
index 7e32d3fb92590b98e085d46ec331125a2a674af2..191e26cb7074d3877d1d6cca4aa112145a604914 100644 (file)
--- a/cyrus-sync.init
+++ b/cyrus-sync.init
@@ -26,46 +26,49 @@ fi
 
 start() {
        # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/cyrus-sync ]; then
-               msg_starting "Cyrus Replication"
-               start-stop-daemon --start --quiet --exec /usr/lib/cyrus/sync_client -- -r
-               if ps -C sync_client >/dev/null 2>&1; then
-                       RETVAL=$?
-                       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cyrus-sync
-                       ok
-               else
-                       fail
-               fi
-       else
+       if [ -f /var/lock/subsys/cyrus-sync ]; then
                msg_already_running "Cyrus Replication"
+               return
        fi
-}
 
-stop() {
-       if [ -f /var/lock/subsys/cyrus-sync ]; then
-               # Stop daemons.
-               msg_stopping "Cyrus Replication"
-               start-stop-daemon --stop --quiet --name sync_client
+       msg_starting "Cyrus Replication"
+       start-stop-daemon --start --quiet --exec /usr/lib/cyrus/sync_client -- -r
+       if ps -C sync_client >/dev/null 2>&1; then
                RETVAL=$?
-               if [ $RETVAL -eq 0 ]; then
-                       rm -f /var/lock/subsys/cyrus-sync
-                       ok
-               else
-                       fail
-               fi
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cyrus-sync
+               ok
        else
+               fail
+       fi
+}
+
+stop() {
+       if [ ! -f /var/lock/subsys/cyrus-sync ]; then
                msg_not_running "Cyrus Replication"
+               return
+       fi
+
+       # Stop daemons.
+       msg_stopping "Cyrus Replication"
+       start-stop-daemon --stop --quiet --name sync_client
+       RETVAL=$?
+       if [ $RETVAL -eq 0 ]; then
+               rm -f /var/lock/subsys/cyrus-sync
+               ok
+       else
+               fail
        fi
 }
 
 condrestart() {
-       if [ -f /var/lock/subsys/cyrus-sync ]; then
-               stop
-               start
-       else
+       if [ ! -f /var/lock/subsys/cyrus-sync ]; then
                msg_not_running "Cyrus Replication"
                RETVAL=$1
+               return
        fi
+
+       stop
+       start
 }
 
 RETVAL=0