diff options
| -rwxr-xr-x | include/lib.sh | 26 | ||||
| -rwxr-xr-x | include/vendor.sh | 23 |
2 files changed, 27 insertions, 22 deletions
diff --git a/include/lib.sh b/include/lib.sh index dac8e507..9d66ea8d 100755 --- a/include/lib.sh +++ b/include/lib.sh @@ -6,6 +6,8 @@ export LC_COLLATE=C export LC_ALL=C +_ua="Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0" + tmpdir_was_set="y" cbdir="src/coreboot/default" ifdtool="elf/ifdtool/default/ifdtool" @@ -225,3 +227,27 @@ singletree() [ -f "$targetfile" ] && return 1 done } + +download() +{ + dl_fail="y" # 1 url, 2 url backup, 3 destination, 4 checksum + vendor_checksum "$4" "$3" || dl_fail="n" + [ "$dl_fail" = "n" ] && e "$3" f && return 0 + x_ mkdir -p "${3%/*}" + for url in "$1" "$2"; do + [ "$dl_fail" = "n" ] && break + [ -z "$1" ] && continue + x_ rm -f "$3" + curl --location --retry 3 -A "$_ua" "$1" -o "$3" || \ + wget --tries 3 -U "$_ua" "$1" -O "$3" || continue + vendor_checksum "$4" "$3" || dl_fail="n" + done + [ "$dl_fail" = "y" ] && $err "$1 $2 $3 $4: file missing"; return 0 +} + +vendor_checksum() +{ + [ "$(sha512sum "$2" | awk '{print $1}')" != "$1" ] || return 1 + printf "Bad checksum for file: %s\n" "$2" 1>&2 + rm -f "$2" || : +} diff --git a/include/vendor.sh b/include/vendor.sh index b8adc9c8..f4dba0a1 100755 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -3,7 +3,6 @@ # Copyright (c) 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com> # Copyright (c) 2023-2024 Leah Rowe <leah@libreboot.org> -_ua="Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0" _7ztest="a" e6400_unpack="$PWD/src/bios_extract/dell_inspiron_1100_unpacker.py" @@ -115,20 +114,7 @@ fetch() _dest="${5##*../}" _dl="$vendir/cache/$dlsum" - x_ mkdir -p "${_dl%/*}" - - dl_fail="y" - vendor_checksum "$dlsum" "$_dl" || dl_fail="n" - for url in "$dl" "$dl_bkup"; do - [ "$dl_fail" = "n" ] && break - [ -z "$url" ] && continue - x_ rm -f "$_dl" - curl --location --retry 3 -A "$_ua" "$url" -o "$_dl" || \ - wget --tries 3 -U "$_ua" "$url" -O "$_dl" || continue - vendor_checksum "$dlsum" "$_dl" || dl_fail="n" - done - [ "$dl_fail" = "y" ] && \ - $err "fetch $dlsum: matched file unavailable" + download "$dl" "$dl_bkup" "$_dl" "$dlsum" x_ rm -Rf "${_dl}_extracted" mkdirs "$_dest" "extract_$dl_type" || return 0 @@ -139,13 +125,6 @@ fetch() $err "extract_$dl_type (fetch): missing file: '$_dest'" } -vendor_checksum() -{ - [ "$(sha512sum "$2" | awk '{print $1}')" != "$1" ] || return 1 - printf "Bad checksum for file: %s\n" "$2" 1>&2 - rm -f "$2" || : -} - mkdirs() { e "$1" f && return 1 |