[vidalia-svn] r2432: Update torbutton version and include the uninstaller with th (vidalia/trunk/pkg/osx)

[phobos@xxxxxxxxxxxxxxxxxxx]

Author: phobos
Date: 2008-03-21 09:41:05 -0400 (Fri, 21 Mar 2008)
New Revision: 2432

Modified:
   vidalia/trunk/pkg/osx/TorPostFlight
   vidalia/trunk/pkg/osx/buildmpkg.sh.in
Log:
Update torbutton version and include the uninstaller with the bundle.


Modified: vidalia/trunk/pkg/osx/TorPostFlight
===================================================================
--- vidalia/trunk/pkg/osx/TorPostFlight	2008-03-21 10:25:43 UTC (rev 2431)
+++ vidalia/trunk/pkg/osx/TorPostFlight	2008-03-21 13:41:05 UTC (rev 2432)
@@ -7,7 +7,7 @@
 TARGET=$2/Library/Tor
 TORDIR=$TARGET/var/lib/tor
 LOGFILE=/var/log/tor.log
-TORBUTTON_VERSION="1.1.10-alpha"
+TORBUTTON_VERSION="1.1.17-alpha"
 
 # Check defaults for TARGET
 if [ "$TARGET" == "//Library/Tor" ]; then
@@ -60,6 +60,11 @@
   find /Library/StartupItems/Privoxy -print0 | xargs -0 chown root:wheel
 fi
 
+if [ -f $PACKAGE_PATH/Contents/Resources/uninstall_tor_bundle.sh ]; then
+  cp $PACKAGE_PATH/Contents/Resources/uninstall_tor_bundle.sh $TARGET/uninstall_tor_bundle.sh
+  chmod 550 $TARGET/uninstall_tor_bundle.sh
+fi
+
 # Copy Documentation
 if [ -d $PACKAGE_PATH/Contents/Resources/documents ];then
    cp -r $PACKAGE_PATH/Contents/Resources/documents $TARGET/documents

Modified: vidalia/trunk/pkg/osx/buildmpkg.sh.in
===================================================================
--- vidalia/trunk/pkg/osx/buildmpkg.sh.in	2008-03-21 10:25:43 UTC (rev 2431)
+++ vidalia/trunk/pkg/osx/buildmpkg.sh.in	2008-03-21 13:41:05 UTC (rev 2432)
@@ -103,7 +103,7 @@
 PACKAGEMAKER=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker
 # 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.12-alpha.xpi
+TORBUTTON_PATH=~/tmp/torbutton-1.1.17-alpha.xpi
 TORBUTTON_LIC_PATH=~/tmp/LICENSE
 
 umask 022