From: Sarantis Paskalis <paskalis@di.uoa.gr>
Date: Mon, 11 Jun 2001 11:37:40 +0000 (+0000)
Subject: Minor editing changes.
X-Git-Tag: v_2_9_9~340
X-Git-Url: http://www.privoxy.org/gitweb/@default-cgi@/static/faq/faq/@default-cgi@send-stylesheet?a=commitdiff_plain;h=4fb8d07941a40fd8430db47374fd94da5b5deb3d;p=privoxy.git

Minor editing changes.
---

diff --git a/junkbuster.init b/junkbuster.init
index 4ab27b70..748b1da0 100644
--- a/junkbuster.init
+++ b/junkbuster.init
@@ -36,6 +36,10 @@
 # 
 #  Revisions   :
 #     $Log: junkbuster.init,v $
+#     Revision 1.4  2001/06/09 09:14:11  swa
+#     shamelessly adapted RPM stuff from the newest rpm that
+#     RedHat provided for the JB.
+#
 #     Revision 1.3  2001/05/25 10:12:44  oes
 #     Fixed default case in switch statement (# -> *)
 #
@@ -57,6 +61,10 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
+. /etc/sysconfig/network
+
+#  Check that networking is up.
+[ ${NETWORKING} = "no" ] && exit 0
 [ -f /usr/sbin/junkbuster ] || exit 0
 
 [ -f /etc/junkbuster/config ] || exit 0
@@ -68,7 +76,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
@@ -81,30 +89,29 @@ stop () {
 	killproc junkbuster && rm -f /var/lock/subsys/junkbuster
 	RETVAL=?$
 	echo
+	return $RETVAL
 }
 
 case "$1" in
-	start)
-		start	
+start)
+	start	
 	;;
-
-	stop)
-		stop	
+stop)
+	stop	
 	;;
-
-	restart)
-		stop
-		start
-		;;
-	condrestart)
-		[ -f /var/lock/subsys/junkbuster ] && restart || : 
+restart)
+	stop
+	start
+	;;
+condrestart)
+	[ -f /var/lock/subsys/junkbuster ] && restart || : 
 	;;
-	status)
-		status junkbuster
+status)
+	status junkbuster
 	;;
-	*)
-		echo $"Usage: junkbuster {start|stop|restart|condrestart|status}"
-		exit 1
+*)
+	echo $"Usage: junkbuster {start|stop|restart|condrestart|status}"
+	exit 1
 esac
 
 exit 0