Create binary osx un-installer, update perms on install so anyone can run the

uninstaller.

svn:r6685

diff --git a/contrib/osx/Makefile.am b/contrib/osx/Makefile.am
index f26148593f97eee904dad431dc480c67cf744fa3..53ba069dc8248225a1971769d63578ac167c4c7f 100644 (file)
--- a/contrib/osx/Makefile.am
+++ b/contrib/osx/Makefile.am
@@ -6,4 +6,4 @@ EXTRA_DIST = PrivoxyConfDesc.plist PrivoxyConfInfo.plist    \
     TorInfo.plist.in TorStartupDesc.plist.in TorStartupInfo.plist            \
     package.sh privoxy.config TorPostflight addsysuser         \
     Tor_Uninstaller.applescript uninstall_tor_bundle.sh \
-    package_list.txt tor_logo.gif
+    package_list.txt tor_logo.gif Tor_Uninstaller_bin.app

diff --git a/contrib/osx/TorPostflight b/contrib/osx/TorPostflight
index cd4992494773d9100bd1aa58560fb80ff8bbe8c0..21beb97aa3a06e0bbd7e9f79d93141c30f5cc827 100644 (file)
--- a/contrib/osx/TorPostflight
+++ b/contrib/osx/TorPostflight
@@ -80,7 +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
    chmod 755 $TARGET/Tor_Uninstaller.applescript
+   chmod 755 $TARGET/Tor_Uninstaller_bin.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
new file mode 100755 (executable)
index 0000000..1a4eb3b
Binary files /dev/null and b/contrib/osx/Tor_Uninstaller_bin.app differ

diff --git a/contrib/osx/package.sh b/contrib/osx/package.sh
index 1012163a0556c327c08b03a03f8c7883421059c0..6cb5e0e0694716c0478bdebbd05c5ad404b0414b 100644 (file)
--- a/contrib/osx/package.sh
+++ b/contrib/osx/package.sh
@@ -78,6 +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/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