Bug 1275632 - Adjust mac update verify scripts to use updater.app/Contents/MacOS/org.mozilla.updater r=nthomas
MozReview-Commit-ID: ICjAxluzcK9
--- a/release/common/check_updates.sh
+++ b/release/common/check_updates.sh
@@ -20,39 +20,45 @@ check_updates () {
if [ "$?" != "0" ]; then
echo "FAILED: cannot unpack_build $update_platform target $target_package"
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"
- updater="Contents/MacOS/updater.app/Contents/MacOS/updater"
+ updaters="Contents/MacOS/updater.app/Contents/MacOS/updater Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater"
binary_file_pattern='^Binary files'
;;
WINNT*)
platform_dirname="bin"
- updater="updater.exe"
+ updaters="updater.exe"
binary_file_pattern='^Files.*and.*differ$'
;;
Linux_x86-gcc | Linux_x86-gcc3 | Linux_x86_64-gcc3)
platform_dirname=`echo $product | tr '[A-Z]' '[a-z]'`
- updater="updater"
+ 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
;;
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
cd source/$platform_dirname;
- cp $updater ../../update
+ for updater in $updaters; do
+ if [ -e "$updater" ]; then
+ echo "Found updater at $updater"
+ cp $updater ../../update
+ break
+ fi
+ done
if [ "$use_old_updater" = "1" ]; then
../../update/updater ../../update . 0
else
../../update/updater ../../update . . 0
fi
cd ../..
else
echo "FAIL: no dir in source/$platform_dirname"