Commit 531cc723 authored by Andrew Lewman's avatar Andrew Lewman
Browse files

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
parent 193a144c

contrib/osx/TorPostflight

+0 −7
Changes for contrib/osx/TorPostflight: 0 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -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

contrib/osx/TorPreFlight

+3 −10
Changes for contrib/osx/TorPreFlight: 3 added lines, 10 removed lines.
Original line number Diff line number Diff line 
#!/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