aboutsummaryrefslogtreecommitdiff
path: root/contrib/osx/TorPreFlight
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/osx/TorPreFlight')
-rw-r--r--contrib/osx/TorPreFlight7
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/osx/TorPreFlight b/contrib/osx/TorPreFlight
index 01da76926..f2cd95acf 100644
--- a/contrib/osx/TorPreFlight
+++ b/contrib/osx/TorPreFlight
@@ -4,20 +4,23 @@
# 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
+elif [ -f /System/Library/LaunchDaemons/net.freehaven.tor.plist ]; 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
+echo $TORPATH
# Backup all of Tor, just in case
if [ -d $TORPATH ]; then
- tar zcf ~/`date "+%Y-%m-%d"`-Tor.backup.tar.gz $TORPATH
+ tar zcf ~/`date "+%Y-%m-%d"`-Tor.backup.tar.gz $TORPATH/var/lib/tor/ $TORPATH/torrc
+ echo `date "+%Y-%m-%d"`-Tor.backup.tar.gz > ~/TorSavedMe
fi
# Remove Tor and everything to do with it
if [ -f $TORPATH/uninstall_tor_bundle.sh ]; then
$TORPATH/uninstall_tor_bundle.sh
+ echo "You made it to the uninstaller"
else
$PACKAGE_PATH/Contents/Resources/uninstall_tor_bundle.sh
fi