packages: courier-imap/courier-imap-pop3.init, courier-imap/courier-imap.in...

[glen]

Author: glen                         Date: Sun Apr 11 12:34:09 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unify with template

---- Files affected:
packages/courier-imap:
   courier-imap-pop3.init (1.18 -> 1.19) , courier-imap.init (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: packages/courier-imap/courier-imap-pop3.init
diff -u packages/courier-imap/courier-imap-pop3.init:1.18 packages/courier-imap/courier-imap-pop3.init:1.19
--- packages/courier-imap/courier-imap-pop3.init:1.18	Sun Apr 11 00:56:47 2010
+++ packages/courier-imap/courier-imap-pop3.init	Sun Apr 11 14:34:04 2010
@@ -27,36 +27,59 @@
 	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/courier-pop3 ]; then
-		msg_starting pop3d
-		daemon $libexecdir/pop3d.rc start
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/courier-pop3
-	else
+	if [ -f /var/lock/subsys/courier-pop3 ]; then
 		msg_already_running pop3d
+		return
 	fi
-	;;
-stop)
-	if [ -f /var/lock/subsys/courier-pop3 ]; then
-		msg_stopping pop3d
-		daemon $libexecdir/pop3d.rc stop
-		RETVAL=$?
-		rm -f /var/lock/subsys/courier-pop3 >/dev/null 2>&1
-	else
+
+	msg_starting pop3d
+	daemon $libexecdir/pop3d.rc start
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/courier-pop3
+}
+
+stop() {
+	if [ ! -f /var/lock/subsys/courier-pop3 ]; then
 		msg_not_running pop3d
+		return
 	fi
+
+	msg_stopping pop3d
+	daemon $libexecdir/pop3d.rc stop
+	RETVAL=$?
+	rm -f /var/lock/subsys/courier-pop3 >/dev/null 2>&1
+}
+
+condrestart() {
+	if [ ! -f /var/lock/subsys/courier-pop3 ]; then
+		msg_not_running pop3d
+		RETVAL=$1
+		return
+	fi
+
+	stop
+	start
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart)
+	stop
+	start
 	;;
-restart|force-reload)
-	$0 stop
-	$0 start
-	exit $?
+  force-reload)
+	condrestart 7
 	;;
-status)
+  status)
 	status couriertcpd
 	exit $?
 	;;

================================================================
Index: packages/courier-imap/courier-imap.init
diff -u packages/courier-imap/courier-imap.init:1.24 packages/courier-imap/courier-imap.init:1.25
--- packages/courier-imap/courier-imap.init:1.24	Sun Apr 11 00:56:47 2010
+++ packages/courier-imap/courier-imap.init	Sun Apr 11 14:34:04 2010
@@ -27,36 +27,59 @@
 	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/courier-imap ]; then
-		msg_starting "Courier IMAP"
-		daemon $libexecdir/imapd.rc start
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/courier-imap
-	else
+	if [ -f /var/lock/subsys/courier-imap ]; then
 		msg_already_running "Courier IMAP"
+		return
 	fi
-	;;
-stop)
-	if [ -f /var/lock/subsys/courier-imap ]; then
-		msg_stopping "Courier IMAP"
-		daemon $libexecdir/imapd.rc stop
-		RETVAL=$?
-		rm -f /var/lock/subsys/courier-imap >/dev/null 2>&1
-	else
+
+	msg_starting "Courier IMAP"
+	daemon $libexecdir/imapd.rc start
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/courier-imap
+}
+
+stop() {
+	if [ ! -f /var/lock/subsys/courier-imap ]; then
 		msg_not_running "Courier IMAP"
+		return
 	fi
+
+	msg_stopping "Courier IMAP"
+	daemon $libexecdir/imapd.rc stop
+	RETVAL=$?
+	rm -f /var/lock/subsys/courier-imap >/dev/null 2>&1
+}
+
+condrestart() {
+	if [ ! -f /var/lock/subsys/courier-imap ]; then
+		msg_not_running "Courier IMAP"
+		RETVAL=$1
+		return
+	fi
+
+	stop
+	start
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart)
+	stop
+	start
 	;;
-restart|force-reload)
-	$0 stop
-	$0 start
-	exit $?
+  force-reload)
+	condrestart 7
 	;;
-status)
+  status)
 	# FIXME: matches other services, like courier-imap-ssl
 	status couriertcpd
 	exit $?
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/courier-imap/courier-imap-pop3.init?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/courier-imap/courier-imap.init?r1=1.24&r2=1.25&f=u