[vidalia-svn] r3021: Replace OS name with architecture compat. (vidalia/trunk/pkg/osx)

[phobos@xxxxxxxxxxxxxxxxxxx]

Author: phobos
Date: 2008-08-30 10:01:18 -0400 (Sat, 30 Aug 2008)
New Revision: 3021

Modified:
   vidalia/trunk/pkg/osx/builddmg.sh.in
   vidalia/trunk/pkg/osx/buildmpkg.sh.in
Log:
Replace OS name with architecture compat.


Modified: vidalia/trunk/pkg/osx/builddmg.sh.in
===================================================================
--- vidalia/trunk/pkg/osx/builddmg.sh.in	2008-08-30 01:29:57 UTC (rev 3020)
+++ vidalia/trunk/pkg/osx/builddmg.sh.in	2008-08-30 14:01:18 UTC (rev 3021)
@@ -35,17 +35,17 @@
   # 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";;
-    "10.2") OS="jaguar";;
-    "10.1") OS="puma";;
-    "10.0") OS="cheetah";;
-         *) OS="unknown";;
+    "10.6") ARCH="universal";;
+    "10.5") ARCH="universal";;
+    "10.4") ARCH="universal";;
+    "10.3") ARCH="ppc";;
+    "10.2") ARCH="ppc";;
+    "10.1") ARCH="ppc";;
+    "10.0") ARCH="ppc";;
+         *) ARCH="unknown";;
   esac
 else
-  OS="unknown"
+  ARCH="unknown"
 fi
 
 # Set the location of the temporary files
@@ -53,7 +53,7 @@
 # Set the Vidalia version
 VERSION="@VERSION@"
 # Set the name of the output .dmg file
-DMG="vidalia-$VERSION-$OS.dmg"
+DMG="vidalia-$VERSION-$ARCH.dmg"
 
 # Get the rest of the command-line arguments
 filelist=$2

Modified: vidalia/trunk/pkg/osx/buildmpkg.sh.in
===================================================================
--- vidalia/trunk/pkg/osx/buildmpkg.sh.in	2008-08-30 01:29:57 UTC (rev 3020)
+++ vidalia/trunk/pkg/osx/buildmpkg.sh.in	2008-08-30 14:01:18 UTC (rev 3021)
@@ -68,17 +68,17 @@
   # 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";;
-    "10.2") OS="jaguar";;
-    "10.1") OS="puma";;
-    "10.0") OS="cheetah";;
-         *) OS="unknown";;
+    "10.6") ARCH="universal";;
+    "10.5") ARCH="universal";;
+    "10.4") ARCH="universal";;
+    "10.3") ARCH="ppc";;
+    "10.2") ARCH="ppc";;
+    "10.1") ARCH="ppc";;
+    "10.0") ARCH="ppc";;
+         *) ARCH="unknown";;
   esac
 else
-  OS="unknown"
+  ARCH="unknown"
 fi
                                   
 # Get the location of Vidalia
@@ -92,7 +92,7 @@
 # Tor's version string
 TORVERSION=`echo "$TOR_DIR" | sed -e "s/.*\///" | sed -e "s/tor-//"`
 # Name of the output bundle
-BUNDLE="vidalia-bundle-$TORVERSION-$VIDALIAVERSION-$OS"
+BUNDLE="vidalia-bundle-$TORVERSION-$VIDALIAVERSION-$ARCH"
 # Set the location of the temporary files
 BUILD_DIR=/tmp/vidalia-osx-$$
 # Set the location of the .mpkg