diff options
| author | Andrew Lewman <andrew@torproject.org> | 2006-07-27 01:20:02 +0000 |
|---|---|---|
| committer | Andrew Lewman <andrew@torproject.org> | 2006-07-27 01:20:02 +0000 |
| commit | cd45eb6175db6ad5b2f959bbe9591f120dcdb77a (patch) | |
| tree | 11f754190e906227bfeb830f7a932bfee487679d | |
| parent | a89bc088387c92a49967d0e68ee4b5a89c36d904 (diff) | |
| download | tor-cd45eb6175db6ad5b2f959bbe9591f120dcdb77a.tar.gz tor-cd45eb6175db6ad5b2f959bbe9591f120dcdb77a.zip | |
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
| -rw-r--r-- | contrib/osx/TorPostflight | 8 | ||||
| -rw-r--r-- | contrib/osx/TorPreFlight | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/contrib/osx/TorPostflight b/contrib/osx/TorPostflight index a8991bb365..4db9cf01ea 100644 --- 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 01da769269..f2cd95acf4 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 |