From 416704fb4e284770798a914c93434e3d91e6b900 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Fri, 29 Sep 2023 23:03:45 +0100 Subject: include/blobutil: try curl first, then wget Don't use only wget. Some systems may only have curl. The user can always install wget anyway, but why not support both? I've added the right user agent string. Signed-off-by: Leah Rowe --- script/update/blobs/download | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'script') diff --git a/script/update/blobs/download b/script/update/blobs/download index 9d41857e..5c832c5f 100755 --- a/script/update/blobs/download +++ b/script/update/blobs/download @@ -154,7 +154,7 @@ extract_e6400vga() err "extract_e6400vga: E6400 VGA offset not defined" [ "${E6400_VGA_romname}" = "" ] && \ err "extract_e6400vga: E6400 VGA ROM name not defined" - tail -c +${E6400_VGA_offset} "${dl_path}" | \ + tail -c +${E6400_VGA_offset} "${_dl}" | \ gunzip >"${appdir}/bios.bin" || : ( cd "${appdir}" || err "extract_e6400vga: can't cd ${appdir}" @@ -172,7 +172,7 @@ extract_e6400vga() extract_sch5545ec() { # full system ROM (UEFI), to extract with UEFIExtract: - _bios="${dl_path}_extracted/Firmware" + _bios="${_dl}_extracted/Firmware" _bios="${_bios}/1 ${dlsum} -- 1 System BIOS vA.28.bin" # this is the SCH5545 firmware, inside of the extracted UEFI ROM: _sch5545ec_fw="${_bios}.dump/4 7A9354D9-0468-444A-81CE-0BF617D890DF" @@ -193,7 +193,7 @@ mkdirs() mkdir -p "${1%/*}" || err "mkdirs ${1} ${2}: !mkdir ${1%/*}" rm -Rf "${appdir}" || err "mkdirs ${1} ${2}: can't remove ${appdir}" mkdir -p "${appdir}/" || err "mkdirs ${1} ${2}: !mkdir ${appdir}" - extract_archive "${dl_path}" "${appdir}" || \ + extract_archive "${_dl}" "${appdir}" || \ [ "${2}" = "extract_e6400vga" ] || err "mkdirs ${1} ${2}: !extract" } -- cgit v1.2.1