X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=slackware%2Frc.privoxy.orig;h=cbd0db5575cd83afa0c663069c8c1470f3a225d2;hb=ce3b5a920b6754fdf9474a451df67daed3b2f243;hp=632a6b78f728abe3ae7faeb10d726164fbabd6d9;hpb=a0f297e590ebd0459bda17f0cb02f04c541d5d58;p=privoxy.git

diff --git a/slackware/rc.privoxy.orig b/slackware/rc.privoxy.orig
index 632a6b78..cbd0db55 100644
--- a/slackware/rc.privoxy.orig
+++ b/slackware/rc.privoxy.orig
@@ -1,5 +1,9 @@
 #!/bin/sh
 #  ********************************************************************
+#  This script uses exit to return proper error codes,
+#  sourcing (. /path/to/rc.privoxy) it in your system's
+#  rc files is a bad idea.
+#  ********************************************************************
 
 RETVAL=1
 
@@ -8,7 +12,7 @@ PRIVOXY_BIN="%SBIN_DEST%/$PRIVOXY_PRG"
 PRIVOXY_CONF="%CONF_DEST%/config"
 PRIVOXY_USER="%USER%"
 PRIVOXY_GROUP="%GROUP%"
-PRIVOXY_PID="/var/run/$PRIVOXY_PRG"/$PRIVOXY_PRG.pid
+PRIVOXY_PID="/var/run/$PRIVOXY_PRG.pid"
 
 declare -i check
 check=(`/bin/ps -e|/bin/grep $PRIVOXY_PRG|/usr/bin/wc -l`)
@@ -19,14 +23,14 @@ if [ ! -f $PRIVOXY_CONF ] ; then exit 0 ;fi
 
 # See how we were called.
 
-PRIVOXY="$PRIVOXY_BIN $PRIVOXY_CONF"
+PRIVOXY="$PRIVOXY_BIN --user $PRIVOXY_USER.$PRIVOXY_GROUP --pidfile $PRIVOXY_PID $PRIVOXY_CONF"
 
 start () {
 	# start daemon
 	echo -n $"Starting $PRIVOXY_PRG: "
 
 	if [ ! -f $PRIVOXY_PID ]; then
-		($PRIVOXY --user $PRIVOXY_USER.$PRIVOXY_GROUP  --pidfile $PRIVOXY_PID 2>/dev/tty9 ) \
+		( $PRIVOXY 2>/dev/tty9 ) \
 			&& echo " OK" \
 			&& /bin/touch /var/lock/$PRIVOXY_PRG \
 			&& RETVAL=0