[or-cvs] r11555: Remove the need to clean up old installs, copy existing conf (tor/trunk/contrib/osx)

[phobos at seul.org]

Author: phobos
Date: 2007-09-21 09:59:58 -0400 (Fri, 21 Sep 2007)
New Revision: 11555

Modified:
   tor/trunk/contrib/osx/TorPostflight
   tor/trunk/contrib/osx/TorPreFlight
Log:
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.


Modified: tor/trunk/contrib/osx/TorPostflight
===================================================================
--- tor/trunk/contrib/osx/TorPostflight	2007-09-21 07:34:42 UTC (rev 11554)
+++ tor/trunk/contrib/osx/TorPostflight	2007-09-21 13:59:58 UTC (rev 11555)
@@ -82,13 +82,6 @@
    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

Modified: tor/trunk/contrib/osx/TorPreFlight
===================================================================
--- tor/trunk/contrib/osx/TorPreFlight	2007-09-21 07:34:42 UTC (rev 11554)
+++ tor/trunk/contrib/osx/TorPreFlight	2007-09-21 13:59:58 UTC (rev 11555)
@@ -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 @@
 
 # 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