X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=junkbuster.init;h=69d622c00635afe8c1a4f71e3938451f64ac3542;hb=d9ff96f6158dc9e9e64c216253ae35e75c13295c;hp=748b1da0a8ef61c2b1f1ccbca99c1d6e0289ded0;hpb=4fb8d07941a40fd8430db47374fd94da5b5deb3d;p=privoxy.git

diff --git a/junkbuster.init b/junkbuster.init
index 748b1da0..69d622c0 100644
--- a/junkbuster.init
+++ b/junkbuster.init
@@ -5,9 +5,6 @@
 # 
 #  Purpose     :  This shell script takes care of starting and stopping
 #                 junkbuster.
-#                 This works only correctly if the user `nobody' is allowed
-#                 to be in the directory where this file is called 
-#                 (for example: /root is NOT ok)
 # 
 #  Copyright   :  Written by and Copyright (C) 2001 the SourceForge
 #                 IJBSWA team.  http://ijbswa.sourceforge.net
@@ -36,6 +33,18 @@
 # 
 #  Revisions   :
 #     $Log: junkbuster.init,v $
+#     Revision 1.8  2001/06/28 13:50:36  sarantis
+#     swap ?$ with $?; remove bogus ";;"
+#
+#     Revision 1.7  2001/06/28 13:40:26  sarantis
+#     remove single quotes from $JB; it was not expanded.
+#
+#     Revision 1.6  2001/06/28 13:38:42  sarantis
+#     formatting changes; individual return values are returned from the init script.
+#
+#     Revision 1.5  2001/06/11 11:37:40  sarantis
+#     Minor editing changes.
+#
 #     Revision 1.4  2001/06/09 09:14:11  swa
 #     shamelessly adapted RPM stuff from the newest rpm that
 #     RedHat provided for the JB.
@@ -65,18 +74,23 @@
 
 #  Check that networking is up.
 [ ${NETWORKING} = "no" ] && exit 0
-[ -f /usr/sbin/junkbuster ] || exit 0
 
-[ -f /etc/junkbuster/config ] || exit 0
+JB_BIN="/usr/sbin/junkbuster"
+JB_CONF="/etc/junkbuster/config"
+JB_USER="junkbuster"
+
+# some checks for us
+[ -x $JB_BIN  ] || exit 0
+[ -f $JB_CONF ] || exit 0
 
 # See how we were called.
 
-JB="/usr/sbin/junkbuster /etc/junkbuster/config & "
+JB="$JB_BIN $JB_CONF &"
+
 start () {
 	# start daemon
-	[ -f /var/lock/subsys/junkbuster ] && exit 0
 	echo -n $"Starting junkbuster: "
-	daemon --user junkbust '$JB' 
+	daemon --user $JB_USER $JB 
 	RETVAL=$?
 	echo
 	[ $RETVAL = 0 ] && touch /var/lock/subsys/junkbuster
@@ -87,31 +101,38 @@ stop () {
 	# stop daemon
 	echo -n $"Stopping junkbuster: "
 	killproc junkbuster && rm -f /var/lock/subsys/junkbuster
-	RETVAL=?$
+	RETVAL=$?
 	echo
 	return $RETVAL
 }
 
 case "$1" in
-start)
+  start)
 	start	
 	;;
-stop)
+  stop)
 	stop	
 	;;
-restart)
+  reload|restart)
 	stop
 	start
+	RETVAL=$?
 	;;
-condrestart)
-	[ -f /var/lock/subsys/junkbuster ] && restart || : 
+  condrestart)
+	# restart only if already running
+	if [ -f /var/lock/subsys/junkbuster ] ; then
+		stop
+		start
+		RETVAL=$?
+	fi 
 	;;
-status)
+  status)
 	status junkbuster
+	RETVAL=$?
 	;;
-*)
-	echo $"Usage: junkbuster {start|stop|restart|condrestart|status}"
+  *)
+	echo $"Usage: junkbuster {start|stop|reload|restart|condrestart|status}"
 	exit 1
 esac
 
-exit 0
+exit $RETVAL