[vidalia-svn] r3089: Fake the old vidalia-bundle filename until we have a better (in vidalia/trunk/pkg: . osx)

[phobos@xxxxxxxxxxxxxxxxxxx]

Author: phobos
Date: 2008-09-13 22:45:33 -0400 (Sat, 13 Sep 2008)
New Revision: 3089

Modified:
   vidalia/trunk/pkg/osx/builddmg.sh.in
   vidalia/trunk/pkg/package.sh
Log:
Fake the old vidalia-bundle filename until we have a better scheme.  


Modified: vidalia/trunk/pkg/osx/builddmg.sh.in
===================================================================
--- vidalia/trunk/pkg/osx/builddmg.sh.in	2008-09-14 01:54:04 UTC (rev 3088)
+++ vidalia/trunk/pkg/osx/builddmg.sh.in	2008-09-14 02:45:33 UTC (rev 3089)
@@ -13,24 +13,21 @@
 ##############################################################################
 
 # Make sure enough arguments were supplied
-if [ "$#" -ne 2 ]
-then
-  echo "Usage: $0 <srcdir> <files to include>"
+if [ "$#" -eq 0 ]; then
+  echo "Usage: $0 <srcdir> <files to include> <vidalia or bundle> <tor-version>"
   exit 1
 fi
 
 # Make sure the source directory exists
 srcdir=$1
-if [ ! -d "$srcdir" ]
-then
+if [ ! -d "$srcdir" ]; then
   echo "Specified source directory doesn't exit: $srcdir"
   exit 1
 fi
 echo "Source Directory: $srcdir"
 
 # Determine OSX Version and map version to name
-if [ -x /usr/bin/sw_vers ]
-then
+if [ -x /usr/bin/sw_vers ]; then
   # This is poor, yet functional.  We don't care about the 3rd number in
   # the OS version
   OSVER=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 | cut -d"." -f1,2`
@@ -52,8 +49,14 @@
 BUILD_DIR=/tmp/vidalia-osx-$$
 # Set the Vidalia version
 VERSION="@VERSION@"
+# Set the Tor version
+TORVERSION="$4"
 # Set the name of the output .dmg file
-DMG="vidalia-$VERSION-$ARCH.dmg"
+if [ $3 = "bundle" ]; then
+  DMG="vidalia-bundle-$TORVERSION-$VERSION-$ARCH.dmg"
+else
+  DMG="vidalia-$VERSION-$ARCH.dmg"
+fi
 
 # Get the rest of the command-line arguments
 filelist=$2

Modified: vidalia/trunk/pkg/package.sh
===================================================================
--- vidalia/trunk/pkg/package.sh	2008-09-14 01:54:04 UTC (rev 3088)
+++ vidalia/trunk/pkg/package.sh	2008-09-14 02:45:33 UTC (rev 3089)
@@ -68,6 +68,7 @@
   torpath="$2"
   polipopath="$3"
   torbuttonpath="$4"
+  torversion=`echo "$torpath" | sed -e "s/.*\///" | sed -e "s/tor-//"`
   
   mkdir ../LEGAL
   cp -R ../README ../src/vidalia/Vidalia.app ../
@@ -80,7 +81,7 @@
   cp $torbuttonpath/torbutton-1.2.0-fx.xpi ../Vidalia.app/
   srcdir="../"
   srcfiles="Vidalia.app README LEGAL"
-  osx/builddmg.sh "$srcdir" "$srcfiles"
+  osx/builddmg.sh "$srcdir" "$srcfiles" "bundle" "$torversion"
   ;;
   
 #