Backup only what is needed, write the file we created to a temp file for

TorPostFlight to restore the data and remove the temp files

svn:r6913

diff --git a/contrib/osx/TorPostflight b/contrib/osx/TorPostflight
index a8991bb3658bdfe8a55583aa23ae077abea8bdad..4db9cf01ea609697741ea31b48f9b38e0b484aa2 100644 (file)
--- a/contrib/osx/TorPostflight
+++ b/contrib/osx/TorPostflight
@@ -114,6 +114,14 @@ if [ -f $PACKAGE_PATH/Contents/Resources/package_list.txt ]; then
    cp $PACKAGE_PATH/Contents/Resources/package_list.txt $TARGET/package_list.txt
 fi
 
+# If the pre-install script did it's thing, it should have saved the
+# config and server keys; put these back and clean up
+if [ -f ~/TorSavedMe ]; then
+       TARBALL=`cat ~/TorSavedMe`
+       tar zxf $TARBALL -C /
+       rm ~/TorSavedMe ~/$TARBALL
+fi
+
 # Determine how to start by OS Version
 if [ $OS = "tiger" ]; then
   if [ -f $PACKAGE_PATH/Contents/Resources/net.freehaven.tor.plist ]; then

diff --git a/contrib/osx/TorPreFlight b/contrib/osx/TorPreFlight
index 01da76926982a003bbd40a79639f74e8f6375689..f2cd95acf420b27f62cc49300fcd5ce230118c94 100644 (file)
--- 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