Formatting changes. Now changing the doctype to DocBook XML 4.1

[privoxy.git] / junkbuster.init

diff --git a/junkbuster.init b/junkbuster.init
index 69d622c..dae12f5 100644 (file)
--- a/junkbuster.init
+++ b/junkbuster.init
@@ -33,6 +33,14 @@
 # 
 #  Revisions   :
 #     $Log: junkbuster.init,v $
+#     Revision 1.10  2001/11/05 21:30:23  steudten
+#     Make JB startup without & due to be a 'real' daemon right now.
+#     Make the script easy to change.
+#
+#     Revision 1.9  2001/09/15 01:53:12  steudten
+#
+#     Remove test for subsys flag in start. Some minor changes.
+#
 #     Revision 1.8  2001/06/28 13:50:36  sarantis
 #     swap ?$ with $?; remove bogus ";;"
 #
@@ -64,9 +72,10 @@
 # chkconfig: 235 84 09
 #
 # description: This shell script takes care of starting and stopping \
-#             junkbuster.
+#              junkbuster.
 #
 
+
 # Source function library.
 . /etc/rc.d/init.d/functions
 
@@ -75,9 +84,11 @@
 #  Check that networking is up.
 [ ${NETWORKING} = "no" ] && exit 0
 
-JB_BIN="/usr/sbin/junkbuster"
-JB_CONF="/etc/junkbuster/config"
+JB_PRG="junkbuster"
+JB_BIN="/usr/sbin/$JB_PRG"
+JB_CONF="/etc/$JB_PRG/config"
 JB_USER="junkbuster"
+JB_PID="/etc/junkbuster"/$JB_PRG.pid
 
 # some checks for us
 [ -x $JB_BIN  ] || exit 0
@@ -85,22 +96,22 @@ JB_USER="junkbuster"
 
 # See how we were called.
 
-JB="$JB_BIN $JB_CONF &"
+JB="$JB_BIN $JB_CONF"
 
 start () {
        # start daemon
-       echo -n $"Starting junkbuster: "
+       echo -n $"Starting $JB_PRG: "
        daemon --user $JB_USER $JB 
        RETVAL=$?
        echo
-       [ $RETVAL = 0 ] && touch /var/lock/subsys/junkbuster
+       [ $RETVAL = 0 ] && touch /var/lock/subsys/$JB_PRG
        return $RETVAL
 }
 
 stop () {
        # stop daemon
-       echo -n $"Stopping junkbuster: "
-       killproc junkbuster && rm -f /var/lock/subsys/junkbuster
+       echo -n $"Stopping $JB_PRG: "
+       killproc $JB_PRG && rm -f /var/lock/subsys/$JB_PRG $JB_PID
        RETVAL=$?
        echo
        return $RETVAL
@@ -113,25 +124,40 @@ case "$1" in
   stop)
        stop    
        ;;
-  reload|restart)
+  reload)
+       if [ -f $JB_PID ] ; then
+                kill -HUP `cat $JB_PID`
+               RETVAL=$?
+        fi
+       ;;
+  restart)
        stop
        start
        RETVAL=$?
        ;;
   condrestart)
        # restart only if already running
-       if [ -f /var/lock/subsys/junkbuster ] ; then
+       if [ -f $JB_PID ] ; then
                stop
                start
                RETVAL=$?
        fi 
        ;;
   status)
-       status junkbuster
+       status $JB_PRG 
        RETVAL=$?
        ;;
+  top)
+       if [ -f $JB_PID ]; then
+                a=""
+                for i in `pidof $JB_PRG` ; do
+                        a="$a -p $i"
+                done
+                top $a
+        fi
+       ;;
   *)
-       echo $"Usage: junkbuster {start|stop|reload|restart|condrestart|status}"
+       echo $"Usage: $JB_PRG {start|stop|reload|restart|condrestart|status|top}"
        exit 1
 esac