From: steudten <steudten@users.sourceforge.net>
Date: Mon, 5 Nov 2001 21:30:23 +0000 (+0000)
Subject: Make JB startup without & due to be a 'real' daemon right now.
X-Git-Tag: v_2_9_10~50
X-Git-Url: http://www.privoxy.org/gitweb/man-page/privoxy-man-page.html?a=commitdiff_plain;h=0c5b7cd3457922c660776509ea92b626fb413a01;p=privoxy.git

Make JB startup without & due to be a 'real' daemon right now.
Make the script easy to change.
---

diff --git a/junkbuster.init b/junkbuster.init
index 69d622c0..3790d24c 100644
--- a/junkbuster.init
+++ b/junkbuster.init
@@ -33,6 +33,10 @@
 # 
 #  Revisions   :
 #     $Log: junkbuster.init,v $
+#     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 ";;"
 #
@@ -75,8 +79,9 @@
 #  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"
 
 # some checks for us
@@ -85,22 +90,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
 	RETVAL=$?
 	echo
 	return $RETVAL
@@ -120,18 +125,18 @@ case "$1" in
 	;;
   condrestart)
 	# restart only if already running
-	if [ -f /var/lock/subsys/junkbuster ] ; then
+	if [ -f /var/lock/subsys/$JB_PRG ] ; then
 		stop
 		start
 		RETVAL=$?
 	fi 
 	;;
   status)
-	status junkbuster
+	status $JB_PRG 
 	RETVAL=$?
 	;;
   *)
-	echo $"Usage: junkbuster {start|stop|reload|restart|condrestart|status}"
+	echo $"Usage: $JB_PRG {start|stop|reload|restart|condrestart|status}"
 	exit 1
 esac