nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove the need to clean up old installs, copy existing configs in order

Browse Source 
to save them, let the installer put new files in place, and let the user
copy back their custom configs, for now.


svn:r11555
This commit is contained in:
Andrew Lewman 2007-09-21 13:59:58 +00:00
parent 193a144c9f
commit 531cc723fe
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/osx/TorPostflight
View File

@ -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

13
contrib/osx/TorPreFlight
View File

@ -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