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

diff --git a/junkbuster.init b/junkbuster.init
index 748b1da0..f35001a8 100644
--- a/junkbuster.init
+++ b/junkbuster.init
@@ -36,6 +36,15 @@
 # 
 #  Revisions   :
 #     $Log: junkbuster.init,v $
+#     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.
@@ -76,7 +85,7 @@ start () {
 	# start daemon
 	[ -f /var/lock/subsys/junkbuster ] && exit 0
 	echo -n $"Starting junkbuster: "
-	daemon --user junkbust '$JB' 
+	daemon --user junkbust $JB 
 	RETVAL=$?
 	echo
 	[ $RETVAL = 0 ] && touch /var/lock/subsys/junkbuster
@@ -87,31 +96,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