X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=junkbuster.init;h=69d622c00635afe8c1a4f71e3938451f64ac3542;hp=10d84395027660c9916a021947975767db94fe8f;hb=baee7762c18f877e34842d6b727fa5e17fe1d69d;hpb=eb12fc1391894a30dc8a6e9c4d9053744b0a279d

diff --git a/junkbuster.init b/junkbuster.init
index 10d84395..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,15 @@
 # 
 #  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.
 #
@@ -68,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
@@ -90,7 +101,7 @@ stop () {
 	# stop daemon
 	echo -n $"Stopping junkbuster: "
 	killproc junkbuster && rm -f /var/lock/subsys/junkbuster
-	RETVAL=?$
+	RETVAL=$?
 	echo
 	return $RETVAL
 }
@@ -113,7 +124,6 @@ case "$1" in
 		stop
 		start
 		RETVAL=$?
-		;;
 	fi 
 	;;
   status)