Be better at finding the Tor install path, backup all of Tor just in

case, then blow Tor away

svn:r6912

diff --git a/contrib/osx/TorPreFlight b/contrib/osx/TorPreFlight
index 8cfb53bca84aebdd47f8e43a641a0cf473082d57..01da76926982a003bbd40a79639f74e8f6375689 100644 (file)
--- a/contrib/osx/TorPreFlight
+++ b/contrib/osx/TorPreFlight
@@ -1,13 +1,25 @@
 #!/bin/sh
 # TorPreFlight is invoked before the install begins
 
-# Find the server keys, if they exist and save them, just in case
-if [ -d /Library/Tor/var/lib/tor/keys ]; then
-       tar zcf ~/`date "+%Y-%m-%d"`-Tor-ServerKeys.backup.tar.gz /Library/Tor/var/lib/tor/keys
+# Figure out where Tor is installed
+if [ -f /Library/StartupItems/Tor/Tor.loc ]; then
+       TORPATH=`cat /Library/StartupItems/Tor/Tor.loc`
+else if [ -f /System/Library/LaunchDaemons/net.freehaven.tor ]; then
+       TORPATH=/`grep -A1 "<key>Program</key>" /System/Library/LaunchDaemons/net.freehaven.tor.plist | grep string | cut -d"/" -f2,3`
+else
+       TORPATH="/Library/Tor/"
+fi
+
+# Backup all of Tor, just in case
+if [ -d $TORPATH ]; then
+       tar zcf ~/`date "+%Y-%m-%d"`-Tor.backup.tar.gz $TORPATH
 fi
 
 # Remove Tor and everything to do with it
-if [ -f /Library/Tor/uninstall_tor_bundle.sh ]; then
-       /Library/Tor/uninstall_tor_bundle.sh
+if [ -f $TORPATH/uninstall_tor_bundle.sh ]; then
+       $TORPATH/uninstall_tor_bundle.sh
+else
+       $PACKAGE_PATH/Contents/Resources/uninstall_tor_bundle.sh
 fi
 
+# This is complete, we have a fresh system on which to install Tor