mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2025-02-22 22:25:51 +01:00
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
This commit is contained in:
parent
a89bc08838
commit
cd45eb6175
2 changed files with 13 additions and 2 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue