packages: exim/exim.init - unify, use functions

[glen]

Author: glen                         Date: Mon Dec 13 13:26:13 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unify, use functions

---- Files affected:
packages/exim:
   exim.init (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: packages/exim/exim.init
diff -u packages/exim/exim.init:1.22 packages/exim/exim.init:1.23
--- packages/exim/exim.init:1.22	Tue Jun 10 09:59:29 2008
+++ packages/exim/exim.init	Mon Dec 13 14:26:07 2010
@@ -15,81 +15,95 @@
 # Source networking configuration.
 . /etc/sysconfig/network
 
+QUEUE=1h
+
 # Source exim configureation.
 if [ -f /etc/sysconfig/exim ]; then
 	. /etc/sysconfig/exim
-else
-	QUEUE=1h
 fi
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
 	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
-		msg_network_down Exim
+		msg_network_down "Exim"
 		exit 1
 	fi
 else
 	exit 0
 fi
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
+start() {
 	# Start daemons.
+	if [ -f /var/lock/subsys/exim ]; then
+		msg_already_running "Exim"
+		return
+	fi
+
+	msg_starting "Exim"
+	daemon exim \
+		$( is_yes "$ALLOW_TCP_CONNECTIONS" && echo -bd ) \
+		$( [ -n "$QUEUE" ] && echo -q$QUEUE )
+	for CONFIG in $EXIM_EXTRA_CONFIGS; do
+			msg_starting "Exim ($CONFIG)"
+			daemon exim \
+				$( is_yes "$ALLOW_TCP_CONNECTIONS" && echo -bd ) \
+				$( [ -n "$QUEUE" ] && echo -q$QUEUE ) \
+				-C $CONFIG
+	done
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/exim
+}
+
+stop() {
+	# Stop daemons.
+	if [ ! -f /var/lock/subsys/exim ]; then
+		msg_not_running "Exim"
+		return
+	fi
+
+	msg_stopping "Exim"
+	killproc --pidfile /var/spool/exim/exim-daemon.pid exim
+	rm -f /var/lock/subsys/exim /var/spool/exim/exim-daemon.pid >/dev/null 2>&1
+}
+
+reload() {
 	if [ ! -f /var/lock/subsys/exim ]; then
-		msg_starting Exim
-		daemon exim \
-			$( is_yes "$ALLOW_TCP_CONNECTIONS" && echo -bd ) \
-			$( [ -n "$QUEUE" ] && echo -q$QUEUE )
-		for CONFIG in $EXIM_EXTRA_CONFIGS; do
-				msg_starting "Exim ($CONFIG)"
-				daemon exim \
-					$( is_yes "$ALLOW_TCP_CONNECTIONS" && echo -bd ) \
-					$( [ -n "$QUEUE" ] && echo -q$QUEUE ) \
-					-C $CONFIG
-		done
+		msg_not_running "Exim"
+		RETVAL=7
+		return
+	fi
+
+	run_cmd "Checking exim configuration" exim -bV
+	if [ $? -eq 0 ]; then
+		msg_reloading "Exim"
+		killproc exim -HUP
 		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/exim
-	else
-		msg_already_running Exim
 	fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+	start
 	;;
   stop)
-	# Stop daemons.
-	if [ -f /var/lock/subsys/exim ]; then
-		msg_stopping Exim
-		killproc --pidfile /var/spool/exim/exim-daemon.pid exim
-		rm -f /var/lock/subsys/exim /var/spool/exim/exim-daemon.pid >/dev/null 2>&1
-	else
-		msg_not_running Exim
-	fi
+	stop
 	;;
   restart)
-	$0 stop
-	$0 start
-	exit $?
-	;;
-  status)
-	status exim
-	exit $?
+	stop
+	start
 	;;
   configtest)
-	exim -bV || exit $?
+	exim -bV
+	RETVAL=$?
 	;;
-
   reload|force-reload)
-	if [ -f /var/lock/subsys/exim ]; then
-		run_cmd "Checking exim configuration" exim -bV
-		if [ $? -eq 0 ]; then
-			msg_reloading Exim
-			killproc exim -HUP
-			RETVAL=$?
-		fi
-	else
-		msg_not_running Exim
-		exit 7
-	fi
+	reload
+	;;
+  status)
+	status exim
+	exit $?
 	;;
   *)
 	msg_usage "$0 {start|stop|restart|reload|force-reload|configtest|status}"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/exim/exim.init?r1=1.22&r2=1.23&f=u