X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=cups.init;h=0cfa5b2577d133213fa0bf9b6ec3c2cdfbe981f6;hb=c0eececa35488566b72f38032a32674368fe3244;hp=e1e5ed85857b8bb622a468e34371d9f54b008792;hpb=f10dd8028996555bb7a1dc0f95040ae728f749ac;p=packages%2Fcups.git

diff --git a/cups.init b/cups.init
index e1e5ed8..0cfa5b2 100644
--- a/cups.init
+++ b/cups.init
@@ -1,6 +1,5 @@
 #!/bin/sh
 #
-#
 # cups		Common UNIX Printing System (CUPS)
 #
 # chkconfig:	2345 90 10
@@ -28,44 +27,58 @@ else
 	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/cups ]; then
-		msg_starting CUPS
-		daemon cupsd -c /etc/cups/cupsd.conf
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/cups
-	else
+	if [ -f /var/lock/subsys/cups ]; then
 		msg_already_running CUPS
+		return
 	fi
-	;;
-  stop)
+
+	msg_starting CUPS
+	daemon /usr/sbin/cupsd -c /etc/cups/cupsd.conf
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/cups
+}
+
+stop() {
 	# Stop daemons.
-	if [ -f /var/lock/subsys/cups ]; then
-		msg_stopping CUPS
-		killproc cupsd
-		rm -f /var/lock/subsys/cups >/dev/null 2>&1
-	else
+	if [ ! -f /var/lock/subsys/cups ]; then
+		msg_not_running CUPS
+		return
+	fi
+
+	msg_stopping CUPS
+	killproc cupsd
+	rm -f /var/lock/subsys/cups >/dev/null 2>&1
+}
+
+reload() {
+	if [ ! -f /var/lock/subsys/cups ]; then
 		msg_not_running CUPS
+		RETVAL=7
+		return
 	fi
+
+	msg_reloading CUPS
+	killproc cupsd -HUP
+	RETVAL=$?
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
 	;;
   restart)
-	$0 stop
-	$0 start
-	exit $?
+	stop
+	start
 	;;
   reload|force-reload)
-	if [ -f /var/lock/subsys/cups ]; then
-		msg_reloading CUPS
-		killproc cupsd -HUP
-		RETVAL=$?
-	else
-		msg_not_running CUPS
-		exit 7
-	fi
+	reload
 	;;
   status)
 	status cups cupsd