[vidalia-svn] r2111: Update torbutton-dev version. Set Vidalia to automatically s (trunk/pkg/osx)

[phobos@xxxxxxxxxxxxxxxxxxx]

Author: phobos
Date: 2007-11-10 21:49:06 -0500 (Sat, 10 Nov 2007)
New Revision: 2111

Modified:
   trunk/pkg/osx/TorPostFlight
   trunk/pkg/osx/build-bundle.txt
   trunk/pkg/osx/buildmpkg.sh.in
Log:
Update torbutton-dev version.  Set Vidalia to automatically start on
user login, for the user that installed the bundle.


Modified: trunk/pkg/osx/TorPostFlight
===================================================================
--- trunk/pkg/osx/TorPostFlight	2007-11-09 15:44:08 UTC (rev 2110)
+++ trunk/pkg/osx/TorPostFlight	2007-11-11 02:49:06 UTC (rev 2111)
@@ -7,7 +7,7 @@
 TARGET=$2/Library/Tor
 TORDIR=$TARGET/var/lib/tor
 LOGFILE=/var/log/tor.log
-TORBUTTON_VERSION="1.1.9.1-alpha"
+TORBUTTON_VERSION="1.1.10-alpha"
 
 # Check defaults for TARGET
 if [ "$TARGET" == "//Library/Tor" ]; then
@@ -80,3 +80,12 @@
       chown -R $USR:$GRP /Applications/Firefox.app/Contents/MacOS/extensions/
   fi
 fi
+
+# Set Vidalia to autostart on login
+if [ -d /Applications/Vidalia.app ]; then
+  if [ -f ~/Library/Preferences/loginwindow.plist ]; then
+    cp ~/Library/Preferences/loginwindow.plist ~/Library/Preferences/loginwindow.plist.tor-saved
+    defaults write loginwindow AutoLaunchedApplicationDictionary -array-add \
+    '<dict><key>Hide</key><false/><key>Path</key><string>/Applications/Vidalia.app</string></dict>'
+  fi
+fi

Modified: trunk/pkg/osx/build-bundle.txt
===================================================================
--- trunk/pkg/osx/build-bundle.txt	2007-11-09 15:44:08 UTC (rev 2110)
+++ trunk/pkg/osx/build-bundle.txt	2007-11-11 02:49:06 UTC (rev 2111)
@@ -39,16 +39,14 @@
 
 Tor
 8. Download and extract the latest Tor source from
-   http://tor.eff.org
+   https://www.torproject.org/download
 
    Note the location in which you extract Tor's source, because you will need
    to specify it in Step 8.
    
 9. Configure Tor with the following:
-   ./configure --prefix=/Library/Tor --bindir=/Library/Tor \
-    --sysconfdir=/Library --enable-static --disable-shared
+   ./configure --prefix=/Library/Tor --bindir=/Library/Tor --sysconfdir=/Library
 
-
 Vidalia
 10. Configure Vidalia with the following:
     ./configure --disable-debug
@@ -58,13 +56,16 @@
 
 11. Run `make` to build Vidalia.
 
+12. Download the latest Torbutton and LICENSE file from https://torbutton.torproject.org/dev/.
+Remember where you put this file.
+
    
 Finish
 12. From Vidalia's pkg/ directory in Vidalia's source, run the following:
      ./package.sh osx-bundle <path-to-tor> <privoxy-package.zip>
   
   Example:
-     ./package.sh osx-bundle ~/tor-0.1.1.19-rc ~/privoxyosx_setup_3.0.3.zip
+     ./package.sh osx-bundle ~/tor-0.2.0.11-alpha ~/privoxyosx_setup_3.0.3.zip
 
   The script that builds the .mpkg (pkg/osx/bundle/buildmpkg.sh) gets Tor's
   version number from the directory name, so it should be named appropriately,

Modified: trunk/pkg/osx/buildmpkg.sh.in
===================================================================
--- trunk/pkg/osx/buildmpkg.sh.in	2007-11-09 15:44:08 UTC (rev 2110)
+++ trunk/pkg/osx/buildmpkg.sh.in	2007-11-11 02:49:06 UTC (rev 2111)
@@ -115,7 +115,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.9.1-alpha.xpi
+TORBUTTON_PATH=~/tmp/torbutton-1.1.10-alpha.xpi
 TORBUTTON_LIC_PATH=~/tmp/LICENSE
 
 umask 022