packages: couchdb/couchdb.init - unify

[glen]

Author: glen                         Date: Sun Feb 26 11:28:52 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unify

---- Files affected:
packages/couchdb:
   couchdb.init (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/couchdb/couchdb.init
diff -u packages/couchdb/couchdb.init:1.3 packages/couchdb/couchdb.init:1.4
--- packages/couchdb/couchdb.init:1.3	Sun Feb 26 12:02:26 2012
+++ packages/couchdb/couchdb.init	Sun Feb 26 12:28:47 2012
@@ -37,54 +37,58 @@
 
 start() {
 	# Check if the service is already running?
-	if [ ! -f /var/lock/subsys/couchdb ]; then
-		msg_starting couchdb
-                test -n $COUCHDB_PID \
-                    && touch $COUCHDB_PID \
-                    && chown $COUCHDB_USER $COUCHDB_PID
-		daemon --user $COUCHDB_USER /usr/bin/couchdb \
-                    -b -c "$COUCHDB_INI" -p "$COUCHDB_PID" \
-                    -o "$COUCHDB_STDOUT" -e "$COUCHDB_STDERR" \
-                    -r "$COUCHDB_RESPAWN"
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/couchdb
-	else
+	if [ -f /var/lock/subsys/couchdb ]; then
 		msg_already_running couchdb
+		return
 	fi
+
+	msg_starting couchdb
+			test -n $COUCHDB_PID \
+				&& touch $COUCHDB_PID \
+				&& chown $COUCHDB_USER $COUCHDB_PID
+	daemon --user $COUCHDB_USER /usr/bin/couchdb \
+				-b -c "$COUCHDB_INI" -p "$COUCHDB_PID" \
+				-o "$COUCHDB_STDOUT" -e "$COUCHDB_STDERR" \
+				-r "$COUCHDB_RESPAWN"
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/couchdb
 }
 
 stop() {
-	if [ -f /var/lock/subsys/couchdb ]; then
-		# Stop daemons.
-		msg_stopping couchdb
-		killproc couchdb
-		killproc --pidfile $COUCHDB_PID couchdb -TERM
-		rm -f /var/lock/subsys/couchdb
-	else
+	if [ ! -f /var/lock/subsys/couchdb ]; then
 		msg_not_running couchdb
+		return
 	fi
+
+	# Stop daemons.
+	msg_stopping couchdb
+	killproc couchdb
+	killproc --pidfile $COUCHDB_PID couchdb -TERM
+	rm -f /var/lock/subsys/couchdb
 }
 
 reload() {
-	if [ -f /var/lock/subsys/couchdb ]; then
-		msg_reloading couchdb
-		killproc couchdb -HUP
-		killproc --pidfile $COUCHDB_PID couchdb -HUP
-		RETVAL=$?
-	else
+	if [ ! -f /var/lock/subsys/couchdb ]; then
 		msg_not_running couchdb
 		RETVAL=7
+		return
 	fi
+
+	msg_reloading couchdb
+	killproc couchdb -HUP
+	killproc --pidfile $COUCHDB_PID couchdb -HUP
+	RETVAL=$?
 }
 
 condrestart() {
-	if [ -f /var/lock/subsys/couchdb ]; then
-		stop
-		start
-	else
+	if [ ! -f /var/lock/subsys/couchdb ]; then
 		msg_not_running couchdb
 		RETVAL=$1
+		return
 	fi
+
+	stop
+	start
 }
 
 RETVAL=0
================================================================

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