[vidalia-svn] r2741: Update vidalia-bundle for osx to work with the new Tor dmgs. (vidalia/trunk/pkg/osx)

[phobos@xxxxxxxxxxxxxxxxxxx]

Author: phobos
Date: 2008-06-16 19:24:27 -0400 (Mon, 16 Jun 2008)
New Revision: 2741

Added:
   vidalia/trunk/pkg/osx/package_list.txt
Modified:
   vidalia/trunk/pkg/osx/buildmpkg.sh.in
Log:
Update vidalia-bundle for osx to work with the new Tor dmgs.


Modified: vidalia/trunk/pkg/osx/buildmpkg.sh.in
===================================================================
--- vidalia/trunk/pkg/osx/buildmpkg.sh.in	2008-06-16 17:48:37 UTC (rev 2740)
+++ vidalia/trunk/pkg/osx/buildmpkg.sh.in	2008-06-16 23:24:27 UTC (rev 2741)
@@ -16,6 +16,7 @@
 #   
 #  Copyright (c) 2001-2004, Roger Dingledine
 #  Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
+#  Copyright (c) 2008, Andrew Lewman
 # 
 #  Redistribution and use in source and binary forms, with or without
 #  modification, are permitted provided that the following conditions are
@@ -67,6 +68,7 @@
   # the OS version
   OSVER=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 | cut -d"." -f1,2`
   case "$OSVER" in
+    "10.6") OS="snowleopard";;
     "10.5") OS="leopard";;
     "10.4") OS="tiger";;
     "10.3") OS="panther";;
@@ -151,7 +153,7 @@
 chmod 755 TorPostFlight
 cp $TOR_DIR/contrib/osx/Tor_Uninstaller.applescript $BUILD_DIR/tor_resources/
 cp $TOR_DIR/contrib/osx/uninstall_tor_bundle.sh  $BUILD_DIR/tor_resources/
-cp $TOR_DIR/contrib/osx/package_list.txt $BUILD_DIR/tor_resources/
+cp package_list.txt $BUILD_DIR/tor_resources/
 cp TorPostflight $BUILD_DIR/tor_resources/postflight
 
 # Tor's documentation
@@ -213,7 +215,6 @@
 unzip $PRIVOXY_PKG -d $PKG_DIR/
 find $PKG_DIR/Privoxy.pkg -type d -print0 | xargs -0 chmod u+w
 
-
 ##
 # Build the Privoxy configuration package
 ##

Added: vidalia/trunk/pkg/osx/package_list.txt
===================================================================
--- vidalia/trunk/pkg/osx/package_list.txt	                        (rev 0)
+++ vidalia/trunk/pkg/osx/package_list.txt	2008-06-16 23:24:27 UTC (rev 2741)
@@ -0,0 +1,6 @@
+Tor
+Privoxy
+torstartup
+privoxyconf
+Vidalia
+torbutton