packages: cyrus-imapd/cyrus-sync.init - formatting

[glen]

Author: glen                         Date: Sat Nov 27 15:09:38 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- formatting

---- Files affected:
packages/cyrus-imapd:
   cyrus-sync.init (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/cyrus-imapd/cyrus-sync.init
diff -u packages/cyrus-imapd/cyrus-sync.init:1.4 packages/cyrus-imapd/cyrus-sync.init:1.5
--- packages/cyrus-imapd/cyrus-sync.init:1.4	Mon Apr 28 15:30:21 2008
+++ packages/cyrus-imapd/cyrus-sync.init	Sat Nov 27 16:09:33 2010
@@ -26,46 +26,49 @@
 
 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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cyrus-imapd/cyrus-sync.init?r1=1.4&r2=1.5&f=u