[or-cvs] Merge RPM spec patch from jbash

[Nick Mathewson]

Update of /home/or/cvsroot/contrib
In directory moria.mit.edu:/tmp/cvs-serv2904/contrib

Modified Files:
	Makefile.am tor.sh.in 
Removed Files:
	tor.spec 
Log Message:
Merge RPM spec patch from jbash

Index: Makefile.am
===================================================================
RCS file: /home/or/cvsroot/contrib/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.am	31 Oct 2004 21:16:09 -0000	1.9
+++ Makefile.am	4 Nov 2004 15:17:22 -0000	1.10
@@ -1,6 +1,6 @@
 confdir = $(sysconfdir)/tor
 
-EXTRA_DIST = tor-tsocks.conf torify.1 tor.spec
+EXTRA_DIST = tor-tsocks.conf torify.1
 
 conf_DATA = tor-tsocks.conf
 

Index: tor.sh.in
===================================================================
RCS file: /home/or/cvsroot/contrib/tor.sh.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tor.sh.in	6 Jun 2004 23:20:28 -0000	1.4
+++ tor.sh.in	4 Nov 2004 15:17:22 -0000	1.5
@@ -10,10 +10,12 @@
 TORBIN=@BINDIR@/tor
 TORPID=@LOCALSTATEDIR@/run/tor/tor.pid
 TORLOG=@LOCALSTATEDIR@/log/tor/tor.log
+TORDATA=@LOCALSTATEDIR@/lib/tor
+
 TORCONF=@CONFDIR@/torrc
 # Strictly speaking, we don't need to su if we have --user and --group.
 # "Belt and suspenders," says jbash.
-TORARGS="--pidfile $TORPID --logfile $TORLOG --runasdaemon 1"
+TORARGS="--pidfile $TORPID --logfile $TORLOG --runasdaemon 1 --datadirectory $TORDATA"
 if [ "x$TORUSER" != "x" ]; then
     TORARGS="$TORARGS --user $TORUSER"
 fi
@@ -56,8 +58,8 @@
             echo " ERROR!"
         fi
     else
-        echo "Unable to kill tor: $TORPID does not exist"
-        RETVAL=1
+        echo "Unable to kill tor: $TORPID does not exist. Assuming already dead."
+        RETVAL=0
     fi
     ;;
 

--- tor.spec DELETED ---