Update torbutton version and if the user chooses to install torbutton,

open firefox with a prompt to install torbutton

svn:r14235

diff --git a/contrib/osx/TorPostflight b/contrib/osx/TorPostflight
index b6b0f27222de3678353e20d3edd96b5964a61d95..ca34c95065a9174d723421e3132b534354e9a5d2 100644 (file)
--- a/contrib/osx/TorPostflight
+++ b/contrib/osx/TorPostflight
@@ -46,7 +46,7 @@ TORGROUP=daemon
 TARGET=$2/Library/Tor
 TORDIR=$TARGET/var/lib/tor
 LOGFILE=/var/log/tor.log
-TORBUTTON_VERSION="1.1.11-alpha"
+TORBUTTON_VERSION="1.1.17-alpha"
 
 # Check defaults for TARGET
 if [ "$TARGET" == "//Library/Tor" ]; then
@@ -123,16 +123,7 @@ fi
 
 if [ -f /Applications/Firefox.app/Contents/MacOS/firefox ]; then
   if [ -f $TARGET/torbutton-$TORBUTTON_VERSION.xpi ]; then
-      /Applications/Firefox.app/Contents/MacOS/firefox -install-global-extension $TARGET/torbutton-$TORBUTTON_VERSION.xpi
-# The following is a kludge to get around the fact that the installer
-# runs as root.  This means the Torbutton extension will install with
-# root permissions; thereby making uninstalling Torbutton from inside
-# Firefox impossible.  The user will be caught in an endless loop of
-# uninstall -> automatic re-installation of Torbutton.  The OSX
-# installer doesn't tell you the owner of Firefox, therefore we have to
-# parse it.
-      USR=`ls -alrt /Applications/Firefox.app/Contents/MacOS/extensions/ | tail -1 | awk '{print $3}'`
-      GRP=`ls -alrt /Applications/Firefox.app/Contents/MacOS/extensions/ | tail -1 | awk '{print $4}'`
-      chown -R $USR:$GRP /Applications/Firefox.app/Contents/MacOS/extensions/
+# Open firefox with a prompt to install the torbutton xpi
+      /Applications/Firefox.app/Contents/MacOS/firefox $TARGET/torbutton-$TORBUTTON_VERSION.xpi
   fi
 fi

diff --git a/contrib/osx/package.sh b/contrib/osx/package.sh
index 3937b367a4844a03fa25094fb39cafb1015ced95..8d78de5faf220f92159b6dbd3ab70569c317b0bd 100644 (file)
--- a/contrib/osx/package.sh
+++ b/contrib/osx/package.sh
@@ -24,7 +24,7 @@ PRIVOXY_PKG_ZIP=~/tmp/privoxyosx_setup_3.0.6.zip
 
 # Where have we put the xpi and license for Torbutton? Edit this if your
 # torbutton and torbutton license live somewhere else.
-TORBUTTON_PATH=~/tmp/torbutton-1.1.14-alpha.xpi
+TORBUTTON_PATH=~/tmp/torbutton-1.1.17-alpha.xpi
 TORBUTTON_LIC_PATH=~/tmp/LICENSE
 
 ###