summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorAndrew Lewman <andrew@torproject.org>2006-07-06 15:52:54 +0000
committerAndrew Lewman <andrew@torproject.org>2006-07-06 15:52:54 +0000
commitd0310413d7f0e45504e04a142a99dd145c0fce48 (patch)
tree9fcbe64b1a38686ec25557dcb29b5a65d404d074 /contrib
parent26ddd3d6e5834f33a8696820be15b91b6c090a38 (diff)
downloadtor-d0310413d7f0e45504e04a142a99dd145c0fce48.tar.gz
tor-d0310413d7f0e45504e04a142a99dd145c0fce48.zip
Backport osx binary uninstaller changes
svn:r6737
Diffstat (limited to 'contrib')
-rw-r--r--contrib/osx/TorPostflight4
-rwxr-xr-xcontrib/osx/Tor_Uninstaller_bin.appbin13780 -> 0 bytes
-rw-r--r--contrib/osx/package.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/contrib/osx/TorPostflight b/contrib/osx/TorPostflight
index 21beb97aa3..3a8f66d9e6 100644
--- a/contrib/osx/TorPostflight
+++ b/contrib/osx/TorPostflight
@@ -80,9 +80,9 @@ fi
# Copy Uninstaller
if [ -f $PACKAGE_PATH/Contents/Resources/Tor_Uninstaller.applescript ]; then
cp $PACKAGE_PATH/Contents/Resources/Tor_Uninstaller.applescript $TARGET/Tor_Uninstaller.applescript
- cp $PACKAGE_PATH/Contents/Resources/Tor_Uninstaller_bin.app $TARGET/Tor_Uninstaller_bin.app
+ cp $PACKAGE_PATH/Contents/Resources/Tor_Uninstaller.app $TARGET/Tor_Uninstaller.app
chmod 755 $TARGET/Tor_Uninstaller.applescript
- chmod 755 $TARGET/Tor_Uninstaller_bin.app
+ chmod 755 $TARGET/Tor_Uninstaller.app
fi
if [ -f $PACKAGE_PATH/Contents/Resources/uninstall_tor_bundle.sh ]; then
diff --git a/contrib/osx/Tor_Uninstaller_bin.app b/contrib/osx/Tor_Uninstaller_bin.app
deleted file mode 100755
index 1a4eb3ba21..0000000000
--- a/contrib/osx/Tor_Uninstaller_bin.app
+++ /dev/null
Binary files differ
diff --git a/contrib/osx/package.sh b/contrib/osx/package.sh
index 6cb5e0e069..a385afeeb7 100644
--- a/contrib/osx/package.sh
+++ b/contrib/osx/package.sh
@@ -78,7 +78,7 @@ chmod 755 contrib/osx/TorPostflight
cp contrib/osx/TorPostflight $BUILD_DIR/tor_resources/postflight
cp contrib/osx/addsysuser $BUILD_DIR/tor_resources/addsysuser
cp contrib/osx/Tor_Uninstaller.applescript $BUILD_DIR/tor_resources/Tor_Uninstaller.applescript
-cp contrib/osx/Tor_Uninstaller_bin.app $BUILD_DIR/tor_resources/Tor_Uninstaller_bin.app
+cp contrib/osx/Tor_Uninstaller.app $BUILD_DIR/tor_resources/Tor_Uninstaller.app
cp contrib/osx/uninstall_tor_bundle.sh $BUILD_DIR/tor_resources/uninstall_tor_bundle.sh
cp contrib/osx/package_list.txt $BUILD_DIR/tor_resources/package_list.txt
cp contrib/osx/tor_logo.gif $BUILD_DIR/tor_resources/background.gif