make unpacking technique work for both 1.5 xpinstaller and 2.0 NSIS win32 builds b=346013 r=davel

testing/release/common/download_builds.sh

@@ -6,30 +6,30 @@ download_builds() {
   if [ "Darwin_ppc-gcc3" == $platform ]; then
     source_platform=mac-ppc
     dirname="mac-ppc"
-    filename="$product _version_.dmg"
+    filename="Firefox 2.0 Beta 2.dmg"
     shortfilename="`echo $product | tr '[A-Z]' '[a-z]'`-_version_.$locale.$dirname.dmg"
   elif [ "Darwin_Universal-gcc3" == $platform ]; then
     source_platform=mac
     dirname="mac"
-    filename="$product _version_.dmg"
+    filename="Firefox 2.0 Beta 2.dmg"
     shortfilename="`echo $product | tr '[A-Z]' '[a-z]'`-_version_.$locale.$dirname.dmg"
   elif [ "Linux_x86-gcc3" == $platform ]; then
     source_platform=linux
     dirname="linux-i686"
     #dirname="linux"
-    filename="`echo $product | tr '[A-Z]' '[a-z]'`-_version_.tar.gz"
+    filename="firefox-2.0b2.tar.gz"
     shortfilename="`echo $product | tr '[A-Z]' '[a-z]'`-_version_.$locale.$dirname.tar.gz"
   elif [ "WINNT_x86-msvc" == $platform ]; then
     source_platform=win32
     dirname="win32"
-    filename="$product Setup _version_.exe"
-    shortfilename="`echo $product | tr '[A-Z]' '[a-z]'`-_version_.$locale.$dirname.exe"
+    filename="Firefox Setup 2.0 Beta 2.exe"
+    shortfilename="`echo $product | tr '[A-Z]' '[a-z]'`-_version_.$locale.$dirname.installer.exe"
   fi
 
   echo "checking $platform $locale"
 
   source_file=`echo $filename | sed "s/_version_/$release/"`
-  target_file=`echo $filename | sed "s/_version_/$latest/"`
+  target_file=`echo $shortfilename | sed "s/_version_/$latest/"`
   cp update/partial.mar update/update.mar
   if [ -f "$source_file" ]; then rm "$source_file"; fi
   #PARAMS="--user=user --password=pass"
@@ -45,7 +45,7 @@ download_builds() {
   fi
   popd > /dev/null
   if [ -f "$target_file" ]; then rm "$target_file"; fi
-  build_url="http://stage.mozilla.org/pub/mozilla.org/`echo $product | tr '[A-Z]' '[a-z]'`/releases/$latest/$dirname/$locale/$target_file" 
+  build_url="http://stage.mozilla.org/pub/mozilla.org/`echo $product | tr '[A-Z]' '[a-z]'`/nightly/${latest}rc${rc}-candidates/rc${rc}/$target_file" 
   pushd downloads > /dev/null
   if [ -f "$target_file" ]; then rm "$target_file"; fi
   wget -nv $PARAMS "$build_url" 2>&1

testing/release/common/unpack.sh

@@ -16,12 +16,17 @@ unpack_build () {
             cd $dir_name
             ;;
         win32) 
-            /usr/local/bin/7za x ../"$pkg_file" > /dev/null
-            for file in *.xpi
-            do
+            /usr/bin/7za x ../"$pkg_file" > /dev/null
+            if [ -d localized ]
+            then
+              mkdir bin/
+              cp -rp localized/* nonlocalized/* optional/* bin/
+            else
+              for file in *.xpi
+              do
                 unzip -o $file > /dev/null
-            done
-
+              done
+            fi
             ;;
         linux) 
             tar xfz ../"$pkg_file" > /dev/null