X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=privoxy-generic.init;h=ac5123443ebd501c5477c5770308ef6d91c89ec5;hp=dbf220364555f99eef83b4c728f1bbcae7886493;hb=b9d96835b666ba142057c0ef0c426d23b8bbd3d1;hpb=b00c8b05d11974e5de9ee38ec1085222c8c50e5a

diff --git a/privoxy-generic.init b/privoxy-generic.init
index dbf22036..ac512344 100755
--- a/privoxy-generic.init
+++ b/privoxy-generic.init
@@ -36,25 +36,6 @@
 # has notable differences from bash. By design, this script does not try to do
 # too much, so as to be as cross-platform as possible.
 #
-# 
-#  Revisions   :
-#     $Log: privoxy-generic.init,v $
-#     Revision 1.3  2002/09/11 01:09:14  hal9
-#     Better handling of pidfile, and process owner.
-#
-#     Revision 1.2  2002/09/08 20:27:58  hal9
-#     -Rewrote script config section.
-#     -Added comments to script.
-#     -Tried to add logic to use a --user privoxy, if available.
-#     -Minor script changes due to 'echo -n' does not work on a true
-#      /bin/sh system.
-#
-#     Revision 1.1  2002/09/06 00:20:26  hal9
-#     Creating a generic init script, meant to be used on platforms where don't have
-#     a custom init script.
-#
-#     Revision 1.0  2002/09/05 17:14:32  hal9
-#
 #######################################################################
 
 # Is this needed by Solaris?
@@ -65,15 +46,15 @@
 # logfile is writable by $P_USER (logfile is defined in config), and that 
 # there is suitable write access for $P_PIDFILE.
 
-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin/:/usr/bin:/sbin:/bin
+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/xpg4/bin:/usr/bin:/sbin:/bin
 P_NAME=Privoxy
 # Path to executable.
 P_DAEMON=privoxy
 # Full path to location of Privoxy config file. 
-P_CONF_FILE=./config
+P_CONF_FILE=/usr/local/etc/privoxy/config
 # Full path to PID file location. Location must be writable by 
-# whoever runs this script.
-P_PIDFILE=`pwd`/privoxy.pid
+# whoever runs this script and by Privoxy itself.
+P_PIDFILE=/var/run/privoxy.pid
 # If uncommented, this script will try to run as USER=privoxy, which
 # may require special handling of config, *.action, trust, logfile, 
 # jarfile, and pidfile.
@@ -81,10 +62,25 @@ P_USER=privoxy
 
 # If a privoxy user is specified, lets try that. /bin/sh does not seem to 
 # know about $UID.
-if [ "$USER" = "root" ] && [ -n "$P_USER" ] && id $P_USER >/dev/null; then
-  P_OWNER=$P_USER
-else 
-  P_OWNER=$USER
+if [ 0 = `id -u` ]; then
+  if [ -n "$P_USER" ]; then
+    id $P_USER 2>/dev/null >/dev/null
+    if [ $? -eq 0 ]; then
+      P_USER_SETTINGS="--user $P_USER"
+    else
+      echo "User $P_USER doesn't exist, exiting."
+      exit 1
+    fi 
+  else
+    # The user has sufficient rights, but $P_USER isn't set
+    echo "Running Privoxy as root is not recommended!" 
+    P_USER_SETTINGS=""
+  fi
+else
+  # The user has insufficient rights to run Privoxy as $P_USER
+  # and may not be able to write or delete the PID file.
+  echo "You aren't root, expect trouble!"
+  P_USER_SETTINGS=""
 fi
 
 if [ ! -f $P_CONF_FILE ]; then
@@ -104,7 +100,7 @@ case "$1" in
        fi
      fi
 
-	$P_DAEMON --pidfile $P_PIDFILE --user $P_OWNER $P_CONF_FILE 2>/dev/null
+	$P_DAEMON --pidfile $P_PIDFILE $P_USER_SETTINGS $P_CONF_FILE 2>/dev/null
      
      if [ $? -eq 0 ]; then
        echo "Starting $P_NAME, OK." 
@@ -121,7 +117,7 @@ case "$1" in
  
  stop)
      test ! -f $P_PIDFILE && echo "No $P_PIDFILE file found, exiting." && exit 1
-     kill `cat $P_PIDFILE` &&\
+     kill `cat $P_PIDFILE` && rm -f $P_PIDFILE && \
      echo "Stopping $P_NAME, OK." || echo "Stopping $P_NAME, failed."
      ;;