Merge from trunk WEB_CONTENT_HANDLING_20070621_BRANCH
authorDan Mosedale <dmose@mozilla.org>
Thu, 19 Jul 2007 17:57:25 -0400
branchWEB_CONTENT_HANDLING_20070621_BRANCH
changeset 88 43098ff4d7a3
parent 72 3d9dc6bba687
child 90 bb9edf37563b
push id38
push usercoop@mozilla.com
push date2009-02-06 21:12 +0000
Merge from trunk
release/common/check_updates.sh
release/common/unpack.sh
--- a/release/common/check_updates.sh
+++ b/release/common/check_updates.sh
@@ -52,14 +52,13 @@ check_updates () {
 
   if [ "$update_status" != "succeeded" ]
   then
     echo "FAIL: update status was not succeeded: $update_status"
     return 1
   fi
 
   diff -r \
-    -x chrome/installed-chrome.txt \
-    -x Contents/MacOS/chrome/installed-chrome.txt \
+    -x installed-chrome.txt \
     -x removed-files \
     source/$platform_dirname target/$platform_dirname 
   return $?
 }
--- a/release/common/unpack.sh
+++ b/release/common/unpack.sh
@@ -16,17 +16,19 @@ unpack_build () {
             hdiutil detach mnt > /dev/null
             cd $dir_name
             ;;
         win32|WINNT_x86-msvc)
             7z x ../"$pkg_file" > /dev/null
             if [ -d localized ]
             then
               mkdir bin/
-              cp -rp localized/* nonlocalized/* optional/* bin/
+              cp -rp nonlocalized/* bin/
+              cp -rp localized/*    bin/
+              cp -rp optional/*     bin/
             else
               for file in *.xpi
               do
                 unzip -o $file > /dev/null
               done
             fi
             ;;
         linux-i686|linux|Linux_x86-gcc|Linux_x86-gcc3)