Make OSX install happier about running on non-default volume.

svn:r3777

diff --git a/contrib/osx/Tor b/contrib/osx/Tor
index ba2b1418d04cfb04320f0d5d8dc777498df7d6bc..83bb2a6f5b92d2670119dd1bf9b9080cf70867aa 100755 (executable)
--- a/contrib/osx/Tor
+++ b/contrib/osx/Tor
@@ -1,11 +1,21 @@
 #!/bin/sh
 
-TORCONF=/Library/Tor/torrc
-TORDIR=/Library/Tor/var/lib/tor
+TORLOC=/Library/StartupItems/Tor/Tor.loc
+
+if [ -f $TORLOC ]; then
+ TORDIR=`cat /Library/StartupItems/Tor/Tor.loc`
+ if [ "x$TORDIR" = "x" -o ! -d $TORDIR -o ! -x $TORDIR/tor ]; then
+   TORDIR=/Library/Tor
+ fi
+else
+ TORDIR=/Library/Tor
+fi
+TORCONF=$TORDIR/torrc
+TORDATA=$TORDIR/var/lib/tor
 TORPID=/var/run/Tor.pid
 TORUSER=_tor
 TORGROUP=daemon
-TORCMD=/Library/Tor/tor
+TORCMD=$TORDIR/tor
 TORLOG=/var/log/tor/tor.log
 
 ##
@@ -25,7 +35,7 @@ StartService ()
 # Tentative
 # Making sure it is not running (I know it is not a best approarch)
                killall tor 2>/dev/null
-               $TORCMD -f $TORCONF --runasdaemon 1 --pidfile $TORPID --datadirectory $TORDIR --user $TORUSER --group $TORGROUP --log "notice file $TORLOG" &
+               $TORCMD -f "$TORCONF" --runasdaemon 1 --pidfile "$TORPID" --datadirectory "$TORDATA" --user "$TORUSER" --group "$TORGROUP" --log "notice file $TORLOG" &
        fi
     fi
 }

diff --git a/contrib/osx/TorPostflight b/contrib/osx/TorPostflight
index e3689589a21a73f131933d72982ed592897df2e2..284fcfc303e97937e022ec502d3596bec8e6ff6e 100644 (file)
--- a/contrib/osx/TorPostflight
+++ b/contrib/osx/TorPostflight
@@ -56,4 +56,10 @@ if [ ! -e /var/log/tor -o -L /var/log/tor ]; then
   cd /var/log
   rm -f tor
   ln -sf $LOGDIR tor
-fi
\ No newline at end of file
+fi
+
+if [ ! -d /Library/StartupItems/Tor ]; then
+  mkdir -p /Library/StartupItems/Tor
+fi
+rm -f /Library/StartupItems/Tor/Tor.loc
+echo "$TARGET" > /Library/StartupItems/Tor/Tor.loc

diff --git a/contrib/osx/TorStartupInfo.plist b/contrib/osx/TorStartupInfo.plist
index 7fd729a59af1f2beb039ece8d2369b299e23216e..593f6f975cde86c3e857e5833561ab59001ba31c 100644 (file)
--- a/contrib/osx/TorStartupInfo.plist
+++ b/contrib/osx/TorStartupInfo.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
        <key>CFBundleGetInfoString</key>
-       <string>Tor Startup Script (experimental)</string>
+       <string>Tor Startup Script</string>
        <key>CFBundleName</key>
        <string>Tor Startup Script</string>
        <key>CFBundleSortVersionString</key>