From: Fabian Keil Date: Sat, 26 Jan 2013 13:31:33 +0000 (+0000) Subject: Remove trailing white-space X-Git-Tag: v_3_0_21~75 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=749aab91b508847bb80deb1e782ac8531f5166b2 Remove trailing white-space --- diff --git a/privoxy-generic.init b/privoxy-generic.init index 23125aac..e71407e0 100755 --- a/privoxy-generic.init +++ b/privoxy-generic.init @@ -1,31 +1,31 @@ -#!/bin/sh -# +#!/bin/sh +# # ******************************************************************** -# +# # File : $Source: /cvsroot/ijbswa/current/privoxy-generic.init,v $ -# +# # Purpose : This shell script takes care of starting and stopping # privoxy. -# +# # Copyright : Written by and Copyright (C) 2001,2002 the SourceForge # Privoxy team. http://www.privoxy.org/ -# +# # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and # Junkbusters Corporation. http://www.junkbusters.com -# +# # This program is free software; you can redistribute it # and/or modify it under the terms of the GNU General # Public License as published by the Free Software # Foundation; either version 2 of the License, or (at # your option) any later version. -# +# # This program is distributed in the hope that it will # be useful, but WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. See the GNU General Public # License for more details. -# +# # The GNU General Public License should be included with # this file. If not, you can view it at # http://www.gnu.org/copyleft/gpl.html @@ -38,26 +38,26 @@ # ####################################################################### -# NOTE: This script may require editing to ensure proper location of -# config file, and the privoxy executable. Care should be taken to ensure -# logfile is writable by $P_USER (logfile is defined in config), and that +# NOTE: This script may require editing to ensure proper location of +# config file, and the privoxy executable. Care should be taken to ensure +# 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/xpg4/bin:/usr/bin:/sbin:/bin P_NAME=Privoxy # Path to executable. P_DAEMON=privoxy -# Full path to location of Privoxy config file. +# Full path to location of Privoxy config file. P_CONF_FILE=/usr/local/etc/privoxy/config -# Full path to PID file location. Location must be writable by +# Full path to PID file location. Location must be writable by # 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, +# may require special handling of config, *.action, trust, logfile, # jarfile, and pidfile. P_USER=privoxy -# If a privoxy user is specified, lets try that. /bin/sh does not seem to +# If a privoxy user is specified, lets try that. /bin/sh does not seem to # know about $UID. if [ 0 = `id -u` ]; then if [ -n "$P_USER" ]; then @@ -67,10 +67,10 @@ if [ 0 = `id -u` ]; then else echo "User $P_USER doesn't exist, exiting." exit 1 - fi + fi else # The user has sufficient rights, but $P_USER isn't set - echo "Running Privoxy as root is not recommended!" + echo "Running Privoxy as root is not recommended!" P_USER_SETTINGS="" fi else @@ -86,7 +86,7 @@ if [ ! -f $P_CONF_FILE ]; then fi case "$1" in - + start) if [ -f $P_PIDFILE ]; then if kill -0 `cat $P_PIDFILE`; then @@ -98,26 +98,26 @@ case "$1" in fi $P_DAEMON --pidfile $P_PIDFILE $P_USER_SETTINGS $P_CONF_FILE 2>/dev/null - + if [ $? -eq 0 ]; then - echo "Starting $P_NAME, OK." + echo "Starting $P_NAME, OK." else echo "Starting $P_NAME, Failed." rm -f $P_PIDFILE fi ;; - + restart) $0 stop $0 start ;; - + stop) test ! -f $P_PIDFILE && echo "No $P_PIDFILE file found, exiting." && exit 1 kill `cat $P_PIDFILE` && rm -f $P_PIDFILE && \ echo "Stopping $P_NAME, OK." || echo "Stopping $P_NAME, failed." ;; - + *) echo "Usage: $0 {start|stop|restart}" exit 1