diff options
| author | Andrew Lewman <andrew@torproject.org> | 2007-09-21 13:59:58 +0000 |
|---|---|---|
| committer | Andrew Lewman <andrew@torproject.org> | 2007-09-21 13:59:58 +0000 |
| commit | 531cc723fe4d4789f5c85bcd78e596dcb124125d (patch) | |
| tree | 160e435643ce343779e1e5d8d21149ce87c574d1 | |
| parent | 193a144c9fc069f230a4e1cd14815b0514731253 (diff) | |
| download | tor-531cc723fe4d4789f5c85bcd78e596dcb124125d.tar.gz tor-531cc723fe4d4789f5c85bcd78e596dcb124125d.zip | |
Remove the need to clean up old installs, copy existing configs in order
to save them, let the installer put new files in place, and let the user
copy back their custom configs, for now.
svn:r11555
| -rw-r--r-- | contrib/osx/TorPostflight | 7 | ||||
| -rw-r--r-- | contrib/osx/TorPreFlight | 13 |
2 files changed, 3 insertions, 17 deletions
diff --git a/contrib/osx/TorPostflight b/contrib/osx/TorPostflight index 20c7d0338b..c1108c05f8 100644 --- a/contrib/osx/TorPostflight +++ b/contrib/osx/TorPostflight @@ -82,13 +82,6 @@ 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 leave for save keeping -TORBACKUP=`ls -rt /tmp/TorSavedMe*| tail -1` -if [ -f ${TORBACKUP} ]; then - tar zxf ${TORBACKUP} -C / -fi - if [ -d /Library/StartupItems/Tor ]; then rm -f /Library/StartupItems/Tor/Tor.loc echo "$TARGET" > /Library/StartupItems/Tor/Tor.loc diff --git a/contrib/osx/TorPreFlight b/contrib/osx/TorPreFlight index a6407d51fe..49b17104b9 100644 --- a/contrib/osx/TorPreFlight +++ b/contrib/osx/TorPreFlight @@ -1,6 +1,5 @@ #!/bin/sh # TorPreFlight is invoked before the install begins -TMPFILE=`mktemp /tmp/TorSavedMe.tgz.XXXXXXXXXXXXX` # Figure out where Tor is installed if [ -f /Library/StartupItems/Tor/Tor.loc ]; then @@ -17,14 +16,8 @@ fi # Backup all of Tor, just in case if [ -d $TORPATH ]; then - tar zcf ${TMPFILE} ${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 |