--- a/debian/changelog	Wed Jun 25 16:23:27 2003 +0100
+++ b/debian/changelog	Wed Jun 25 16:34:53 2003 +0100
@@ -7,6 +7,7 @@
   * Fixed/explained handling of inetd.conf, closes: #198118.
   * Thanks to Dan Jacobson for reporting all of the above.
   * Added patch, ucf, and libgdbmg1-dev option to (build-)dependencies.
+  * Minor code cleanups in debian/.
 
  -- Martin A. Godisch <godisch@debian.org>  Wed, 25 Jun 2003 17:21:20 +0200
 

--- a/debian/conf.debian	Wed Jun 25 16:23:27 2003 +0100
+++ b/debian/conf.debian	Wed Jun 25 16:34:53 2003 +0100
@@ -1,10 +1,6 @@
 # Debian specific NOFFLE configuration
 # See /etc/news/noffle.conf for the NOFFLE main configuration.
 
-# Please keep the following line!
-#
-NOFFLE=/usr/bin/noffle
-
 # The fetchmode may either be "ppp" or "cron", "ppp" means that
 # the fetch should be run in the ip-up part of ppp, "cron" means
 # that the fetch should be run periodically; this assumes a

--- a/debian/init	Wed Jun 25 16:23:27 2003 +0100
+++ b/debian/init	Wed Jun 25 16:34:53 2003 +0100
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: init 578 2003-06-24 09:28:18Z godisch $
+# $Id: init 585 2003-06-25 15:34:53Z godisch $
 
 set -e
 
@@ -33,15 +33,15 @@
 start)
 	echo -n "Initializing offline news server: "
 	if [ "$NOFFLE_FETCHMODE" = ppp ]; then
-		$NOFFLE --offline
+		"$NOFFLE" --offline
 	else
-		$NOFFLE --online
+		"$NOFFLE" --online
 	fi
 	echo "."
 	;;
 stop)
 	echo -n "Switching offline news server into offline mode: "
-	$NOFFLE --offline
+	"$NOFFLE" --offline
 	echo "."
 	;;
 restart)
@@ -56,7 +56,7 @@
 	;;
 online|offline)
 	echo -n "Switching offline news server into $1 mode: "
-	$NOFFLE --$1
+	"$NOFFLE" --$1
 	echo "."
 	;;
 *)

--- a/debian/noffle-cronfetch	Wed Jun 25 16:23:27 2003 +0100
+++ b/debian/noffle-cronfetch	Wed Jun 25 16:34:53 2003 +0100
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: noffle-cronfetch 434 2003-02-14 13:54:32Z godisch $
+# $Id: noffle-cronfetch 585 2003-06-25 15:34:53Z godisch $
 #
 # noffle script to fetch articles, run from cron
 
@@ -14,20 +14,20 @@
 
 if [ -f "$LOCKFILE" ]; then
     # check if pid still exists
-    if kill -0 `cat $LOCKFILE`; then
+    if kill -0 `cat "$LOCKFILE"`; then
         logger -i -p news.info -t noffle-cronfetch -- "previous instance still running"
         exit 0
     fi
     # false lock
     logger -i -p news.warning -t noffle-cronfetch -- "removing stale lock $LOCKFILE"
-    rm -f $LOCKFILE
+    rm -f "$LOCKFILE"
 fi
 
-trap 'rm -f $LOCKFILE' 0 1 2 15
+trap 'rm -f "$LOCKFILE"' 0 1 2 15
 
-echo $$ > $LOCKFILE
-$NOFFLE --fetch 
-rm -f $LOCKFILE
+echo "$$" > "$LOCKFILE"
+"$NOFFLE" --fetch 
+rm -f "$LOCKFILE"
 
 trap '' 0
 exit 0