X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=junkbuster.init;h=f35001a887febf630f87735d1c613e60f2dc22ee;hp=4ab27b702644c3c7587305c5caeebf18d2d2a184;hb=3939d3eae875607c76d7bb3314ff6ca6d0590f40;hpb=0f154e8911b90278cf234e73bfc2029734e030c7

diff --git a/junkbuster.init b/junkbuster.init
index 4ab27b70..f35001a8 100644
--- a/junkbuster.init
+++ b/junkbuster.init
@@ -36,6 +36,19 @@
 # 
 #  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.
+#
 #     Revision 1.3  2001/05/25 10:12:44  oes
 #     Fixed default case in switch statement (# -> *)
 #
@@ -57,6 +70,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
@@ -79,32 +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)
+	start	
 	;;
-
-	stop)
-		stop	
+  stop)
+	stop	
 	;;
-
-	restart)
+  reload|restart)
+	stop
+	start
+	RETVAL=$?
+	;;
+  condrestart)
+	# restart only if already running
+	if [ -f /var/lock/subsys/junkbuster ] ; then
 		stop
 		start
-		;;
-	condrestart)
-		[ -f /var/lock/subsys/junkbuster ] && restart || : 
+		RETVAL=$?
+	fi 
 	;;
-	status)
-		status junkbuster
+  status)
+	status junkbuster
+	RETVAL=$?
 	;;
-	*)
-		echo $"Usage: junkbuster {start|stop|restart|condrestart|status}"
-		exit 1
+  *)
+	echo $"Usage: junkbuster {start|stop|reload|restart|condrestart|status}"
+	exit 1
 esac
 
-exit 0
+exit $RETVAL