Remove test for subsys flag in start. Some minor changes.

diff --git a/junkbuster.init b/junkbuster.init
index f35001a..69d622c 100644 (file)
--- 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,9 @@
 # 
 #  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.
 #
@@ -74,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