Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 21:01:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1884173: fix shellcheck errors in update verify that involve removing function arguments r=jcristau

Browse Source 
This could probably have gone in the previous patch in the end...but this is fine too.

Differential Revision: https://phabricator.services.mozilla.com/D203990
This commit is contained in:
Ben Hearsum 2024-03-20 16:23:16 +00:00
parent de42a923b1
commit 4d39d8cf8f
3 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/update-verify/release/common/check_updates.sh
View File

@ -8,17 +8,15 @@ check_updates () {
source_package=$2 source_package=$2
target_package=$3 target_package=$3
locale=$4 locale=$4
# TODO: remove this unused var updater=$5
use_old_updater=$5 diff_file=$6
updater=$6 channel=$7
diff_file=$7 mar_channel_IDs=$8
channel=$8 update_to_dep=$9
mar_channel_IDs=$9
update_to_dep=${10}
local mac_update_settings_dir_override local mac_update_settings_dir_override
mac_update_settings_dir_override=${11} mac_update_settings_dir_override=${10}
local product local product
product=${12} product=${11}
# cleanup # cleanup
rm -rf source/* rm -rf source/*

3
tools/update-verify/release/common/download_mars.sh
View File

@ -39,7 +39,8 @@ download_mars () {
command=$(echo "$update_line" | sed -e 's/^.*<update //' -e 's:>.*$::' -e 's:\&amp;:\&:g') command=$(echo "$update_line" | sed -e 's/^.*<update //' -e 's:>.*$::' -e 's:\&amp;:\&:g')
eval "export $command" eval "export $command"
# TODO: fix all these undefined vars # TODO: fix all these undefined vars, or maybe we should just ignore them and accept
# the magic?
if [ -n "$to_build_id" ] && [ "$buildID" != "$to_build_id" ]; then if [ -n "$to_build_id" ] && [ "$buildID" != "$to_build_id" ]; then
echo "TEST-UNEXPECTED-FAIL: expected buildID $to_build_id does not match actual $buildID" echo "TEST-UNEXPECTED-FAIL: expected buildID $to_build_id does not match actual $buildID"
return 1 return 1

14
tools/update-verify/release/updates/verify.sh
View File

@ -111,23 +111,11 @@ do
channel="" channel=""
from="" from=""
patch_types="complete" patch_types="complete"
use_old_updater=0
mar_channel_IDs="" mar_channel_IDs=""
updater_package="" updater_package=""
mac_update_settings_dir_override="" mac_update_settings_dir_override=""
eval "$entry" eval "$entry"
# the arguments for updater changed in Gecko 34/SeaMonkey 2.31
major_version=$(echo "$release" | cut -f1 -d.)
if [[ "$product" == "seamonkey" ]]; then
minor_version=$(echo "$release" | cut -f2 -d.)
if [[ $major_version -le 2 && $minor_version -lt 31 ]]; then
use_old_updater=1
fi
elif [[ $major_version -lt 34 ]]; then
use_old_updater=1
fi
# Note: cross platform tests seem to work for everything except Mac-on-Windows. # Note: cross platform tests seem to work for everything except Mac-on-Windows.
# We probably don't care about this use case. # We probably don't care about this use case.
if [[ "$updater_package" == "" ]]; then if [[ "$updater_package" == "" ]]; then
@ -278,7 +266,7 @@ do
if [ -e ${diff_file} ]; then if [ -e ${diff_file} ]; then
rm ${diff_file} rm ${diff_file}
fi fi
check_updates "${platform}" "downloads/${source_file}" "downloads/${target_file}" "${locale}" "${use_old_updater}" "${updater}" ${diff_file} "${channel}" "${mar_channel_IDs}" ${update_to_dep} "${mac_update_settings_dir_override}" "${product}" check_updates "${platform}" "downloads/${source_file}" "downloads/${target_file}" "${locale}" "${updater}" ${diff_file} "${channel}" "${mar_channel_IDs}" ${update_to_dep} "${mac_update_settings_dir_override}" "${product}"
err=$? err=$?
if [ "$err" == "0" ]; then if [ "$err" == "0" ]; then
continue continue