aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Lewman <andrew@torproject.org>2007-10-14 12:26:59 +0000
committerAndrew Lewman <andrew@torproject.org>2007-10-14 12:26:59 +0000
commit291dc2eeed24907df1c129823d8fd13d3074ea06 (patch)
tree0a141a1665e0dca549ca88ab57a80bb4657d0eb3
parent2e11f7d9dd82b68d9d37fe54a3ddaa8df7fee27b (diff)
downloadtor-291dc2eeed24907df1c129823d8fd13d3074ea06.tar.gz
tor-291dc2eeed24907df1c129823d8fd13d3074ea06.zip
Backport TorPreFlight changes.
svn:r11930
-rw-r--r--contrib/osx/TorPreFlight12
1 files changed, 3 insertions, 9 deletions
diff --git a/contrib/osx/TorPreFlight b/contrib/osx/TorPreFlight
index b147264861..49b17104b9 100644
--- a/contrib/osx/TorPreFlight
+++ b/contrib/osx/TorPreFlight
@@ -16,14 +16,8 @@ fi
# Backup all of Tor, just in case
if [ -d $TORPATH ]; then
- tar zcf /tmp/TorSavedMe.tar.gz $TORPATH/var/lib/tor $TORPATH/torrc $PRIVOXYPATH/config $PRIVOXYPATH/user.action
+ cp ${TORPATH}/torrc ${TORPATH}/torrc.installer-saved
+ cp ${PRIVOXYPATH}/config ${PRIVOXYPATH}/config.installer-saved
+ cp ${PRIVOXYPATH}/user.action ${PRIVOXYPATH}/user.action.installer-saved
fi
-# Remove Tor and everything to do with it
-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