[or-cvs] r14236: Backport torbutton version and installation changes. (tor/branches/tor-0_2_0-patches/contrib/osx)

[phobos@xxxxxxxx]

Author: phobos
Date: 2008-03-29 20:43:12 -0400 (Sat, 29 Mar 2008)
New Revision: 14236

Modified:
   tor/branches/tor-0_2_0-patches/contrib/osx/TorPostflight
Log:
Backport torbutton version and installation changes.


Modified: tor/branches/tor-0_2_0-patches/contrib/osx/TorPostflight
===================================================================
--- tor/branches/tor-0_2_0-patches/contrib/osx/TorPostflight	2008-03-30 00:40:09 UTC (rev 14235)
+++ tor/branches/tor-0_2_0-patches/contrib/osx/TorPostflight	2008-03-30 00:43:12 UTC (rev 14236)
@@ -123,16 +123,7 @@
 
 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