aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorAndrew Lewman <andrew@torproject.org>2008-03-30 00:40:09 +0000
committerAndrew Lewman <andrew@torproject.org>2008-03-30 00:40:09 +0000
commitae4150dd02afacf0f7420a1ed8777fc8d8a84dd5 (patch)
tree14b63663c15a9b37f25f031023808dace95cc93f /contrib
parent4c81d0d3ebd9653383e3ebf059d1941e9276df7c (diff)
downloadtor-ae4150dd02afacf0f7420a1ed8777fc8d8a84dd5.tar
tor-ae4150dd02afacf0f7420a1ed8777fc8d8a84dd5.tar.gz
Update torbutton version and if the user chooses to install torbutton,
open firefox with a prompt to install torbutton svn:r14235
Diffstat (limited to 'contrib')
-rw-r--r--contrib/osx/TorPostflight15
-rw-r--r--contrib/osx/package.sh2
2 files changed, 4 insertions, 13 deletions
diff --git a/contrib/osx/TorPostflight b/contrib/osx/TorPostflight
index b6b0f2722..ca34c9506 100644
--- 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 3937b367a..8d78de5fa 100644
--- 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
###