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

diff --git a/cups.init b/cups.init
index e45d106..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,51 +27,64 @@ else
 	exit 0
 fi
 
+start() {
+	# Check if the service is already running?
+	if [ -f /var/lock/subsys/cups ]; then
+		msg_already_running CUPS
+		return
+	fi
+
+	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_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)
-	# 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
-		msg_already_running CUPS
-	fi
+	start
 	;;
   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
-		msg_not_running CUPS
-	fi	
+	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 >&2
-		exit 7
-	fi
+	reload
 	;;
   status)
 	status cups cupsd
 	exit $?
 	;;
   *)
-	# show "Usage: %s {start|stop|restart|reload|force-reload|status}"
 	msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
 	exit 3
 esac