[or-cvs] r11930: Backport TorPreFlight changes. (tor/branches/tor-0_1_2-patches/contrib/osx)

[phobos@xxxxxxxx]

Author: phobos
Date: 2007-10-14 08:26:59 -0400 (Sun, 14 Oct 2007)
New Revision: 11930

Modified:
   tor/branches/tor-0_1_2-patches/contrib/osx/TorPreFlight
Log:
Backport TorPreFlight changes.


Modified: tor/branches/tor-0_1_2-patches/contrib/osx/TorPreFlight
===================================================================
--- tor/branches/tor-0_1_2-patches/contrib/osx/TorPreFlight	2007-10-14 08:48:59 UTC (rev 11929)
+++ tor/branches/tor-0_1_2-patches/contrib/osx/TorPreFlight	2007-10-14 12:26:59 UTC (rev 11930)
@@ -16,14 +16,8 @@
 
 # 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