bug 1363334 - back out d7ab9245abc4 and 5792f31efcba. r=bustage
authorAki Sasaki <asasaki@mozilla.com>
Wed, 10 May 2017 22:06:32 -0700
changeset 7503 64973b395ed7336acdd15624c8aea53959174538
parent 7502 d7ab9245abc4058d8bd4bf1b7951d09caec37c89
child 7504 8002447fa2422cd2bcce40fca04f5e0472837599
push id5582
push userasasaki@mozilla.com
push dateThu, 11 May 2017 05:06:35 +0000
reviewersbustage
bugs1363334
bug 1363334 - back out d7ab9245abc4 and 5792f31efcba. r=bustage
.hgtags
release/common/check_updates.sh
--- a/.hgtags
+++ b/.hgtags
@@ -6705,10 +6705,8 @@ b053ca716a22baa87c8417ae5265b3d19107eebf
 ed49bb06b72d9591d5ede08953a1234b8d6e1e83 THUNDERBIRD_54_0b1_RELEASE
 b053ca716a22baa87c8417ae5265b3d19107eebf THUNDERBIRD_54_0b1_RELEASE
 6b1979cd5a7db7dfb5cc1e5a9506cc6697b90b81 FIREFOX_54_0b6_BUILD1_RUNTIME
 6b1979cd5a7db7dfb5cc1e5a9506cc6697b90b81 FIREFOX_54_0b6_RELEASE_RUNTIME
 b0b27baa63370f8d5f1e40d9ed09a0fd4b6eaccb THUNDERBIRD_52_1_1_BUILD1
 b0b27baa63370f8d5f1e40d9ed09a0fd4b6eaccb THUNDERBIRD_52_1_1_RELEASE
 6b1979cd5a7db7dfb5cc1e5a9506cc6697b90b81 FIREFOX_54_0b6_BUILD1_RUNTIME
 0c5eeea4f3b618b3a946868252f78fa1ed9b9b53 FIREFOX_54_0b6_BUILD1_RUNTIME
-0c5eeea4f3b618b3a946868252f78fa1ed9b9b53 FIREFOX_54_0b6_BUILD1_RUNTIME
-5792f31efcbac15175d5c4407e1360c7731e5f49 FIREFOX_54_0b6_BUILD1_RUNTIME
--- a/release/common/check_updates.sh
+++ b/release/common/check_updates.sh
@@ -22,63 +22,50 @@ check_updates () {
     return 1
   fi
   
   case $update_platform in
       Darwin_ppc-gcc | Darwin_Universal-gcc3 | Darwin_x86_64-gcc3 | Darwin_x86-gcc3-u-ppc-i386 | Darwin_x86-gcc3-u-i386-x86_64 | Darwin_x86_64-gcc3-u-i386-x86_64) 
           platform_dirname="*.app"
           updaters="Contents/MacOS/updater.app/Contents/MacOS/updater Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater"
           binary_file_pattern='^Binary files'
-          is_windows=0
           ;;
       WINNT*) 
           platform_dirname="bin"
           updaters="updater.exe"
           binary_file_pattern='^Files.*and.*differ$'
-          is_windows=1
           ;;
       Linux_x86-gcc | Linux_x86-gcc3 | Linux_x86_64-gcc3) 
           platform_dirname=`echo $product | tr '[A-Z]' '[a-z]'`
           updaters="updater"
           binary_file_pattern='^Binary files'
           # Bug 1209376. Linux updater linked against other libraries in the installation directory
           export LD_LIBRARY_PATH=$PWD/source/$platform_dirname
-          is_windows=0
           ;;
   esac
 
   if [ -f update/update.status ]; then rm update/update.status; fi
   if [ -f update/update.log ]; then rm update/update.log; fi
 
   if [ -d source/$platform_dirname ]; then
-    # abspaths, with backslashes for windows, to address the changes in
-    # https://hg.mozilla.org/mozilla-central/rev/702bca2e601f#l9.79
-    if [ $is_windows -ne 0 ]; then
-      cwd=$(echo $PWD/source/$platform_dirname | sed -e 's,/,\\\\,g')
-      update_abspath=$(echo $PWD/update | sed -e 's,/,\\\\,g')
-      updater_abspath="$update_abspath\\$updater_bin"
-    else
-      cwd="$PWD/source/$platform_dirname"
-      update_abspath="$PWD/update"
-      updater_abspath="$update_abspath/$updater_bin"
-    fi
+    update_abspath="$PWD/update"
     cd source/$platform_dirname;
     updater_bin="updater"
     for updater in $updaters; do
         if [ -e "$updater" ]; then
             echo "Found updater at $updater"
             cp $updater ../../update
             updater_bin=$(basename $updater)
             break
         fi
     done
     if [ "$use_old_updater" = "1" ]; then
-        "$updater_abspath" "$update_abspath" "$cwd" 0
+        "$update_abspath/$updater_bin" "$update_abspath" "$PWD" 0
     else
-        "$updater_abspath" "$update_abspath" "$cwd" "$cwd" 0
+        "$update_abspath/$updater_bin" "$update_abspath" "$PWD" "$PWD" 0
     fi
     cd ../..
   else
     echo "FAIL: no dir in source/$platform_dirname"
     return 1
   fi
 
   cat update/update.log