commit 2acce6cf3e68858ab5debb3672d2b2ca7d4ce097
Author: Elan Ruusamäe <[email protected]>
Date:   Wed Jan 6 22:24:28 2016 +0200

    simplify/unify initscript

 tinyproxy.init | 78 ++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 46 insertions(+), 32 deletions(-)
---
diff --git a/tinyproxy.init b/tinyproxy.init
index 45bf5ba..4487e32 100755
--- a/tinyproxy.init
+++ b/tinyproxy.init
@@ -4,7 +4,7 @@
 #
 # chkconfig:   2345 90 25
 #
-# description: tinyproxy is a small HTTP/HTTPS proxy server
+# description: Tinyproxy is a small HTTP/HTTPS proxy server
 #
 
 # Source function library
@@ -19,52 +19,66 @@
 # 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 tinyproxy
+               msg_network_down "Tinyproxy"
                exit 1
        fi
 else
        exit 0
 fi
 
+start() {
+       # Check if the service is already running?
+       if [ -f /var/lock/subsys/tinyproxy ]; then
+               msg_already_running "Tinyproxy"
+               return
+       fi
+
+       msg_starting "Tinyproxy"
+       daemon /usr/sbin/tinyproxy
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/tinyproxy
+}
+
+stop() {
+       if [ ! -f /var/lock/subsys/tinyproxy ]; then
+               msg_not_running "Tinyproxy"
+               return
+       fi
+
+       # Stop daemons.
+       msg_stopping "Tinyproxy"
+       killproc tinyproxy
+       RETVAL=$?
+       rm -f /var/lock/subsys/tinyproxy
+}
+
+reload() {
+       if [ ! -f /var/lock/subsys/tinyproxy ]; then
+               msg_not_running "Tinyproxy"
+               RETVAL=7
+               return
+       fi
+
+       msg_reloading "Tinyproxy"
+       killproc tinyproxy -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/tinyproxy ]; then
-               msg_starting tinyproxy
-               daemon /usr/sbin/tinyproxy
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/tinyproxy
-       else
-               msg_already_running tinyproxy
-       fi
+       start
        ;;
   stop)
-       if [ -f /var/lock/subsys/tinyproxy ]; then
-               # Stop daemons.
-               msg_stopping tinyproxy
-               killproc tinyproxy
-               RETVAL=$?
-               rm -f /var/lock/subsys/tinyproxy
-       else
-               msg_not_running tinyproxy
-       fi
-       ;;
+       stop
+       ;;
   restart)
-       $0 stop
-       $0 start
-       RETVAL=$?
+       stop
+       start
        ;;
   reload|force-reload)
-       if [ -f /var/lock/subsys/tinyproxy ]; then
-               msg_reloading tinyproxy
-               killproc tinyproxy -HUP
-               RETVAL=$?
-       else
-               msg_not_running tinyproxy >&2
-               RETVAL=7
-       fi
+       reload
        ;;
   status)
        status tinyproxy
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/tinyproxy.git/commitdiff/2acce6cf3e68858ab5debb3672d2b2ca7d4ce097

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to