diff options
| author | Leah Rowe <leah@libreboot.org> | 2023-10-20 04:10:50 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2023-10-20 05:03:16 +0100 |
| commit | 6af65ad430ae58bac5afd0d6e12a97e5e12e9b59 (patch) | |
| tree | 6fd88f362d2ea26ae78d614aa0a3043fa3ddc422 /script/vendor/download | |
| parent | 4e54a051ef4ae66bae402479cd4ecdc9709e44ca (diff) | |
error handling code cleanup and fixes
in some cases, use of x_ or xx_ can be error-prone,
due to the way $@ is handled; commands requiring
quotes, or with funny file names as arguments such
as spaces in the file name, or other special
characters, can make the x/xx functions break.
in those cases, where x/xx must not be used, the
commands use || err instead
in other cases, use of x/xx is superfluous, and has
been removed in some commands.
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'script/vendor/download')
| -rwxr-xr-x | script/vendor/download | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/script/vendor/download b/script/vendor/download index e8c7e5a4..40244fff 100755 --- a/script/vendor/download +++ b/script/vendor/download @@ -134,7 +134,7 @@ mkdirs() { [ -f "${1}" ] && \ printf "mkdirs ${1} ${2}: already downloaded\n" 1>&2 && return 1 - x_ mkdir -p "${1%/*}" + mkdir -p "${1%/*}" || err "mkdirs: !mkdir -p ${1%/*}" x_ rm -Rf "${appdir}" x_ mkdir -p "${appdir}/" extract_archive "${_dl}" "${appdir}" || \ @@ -190,7 +190,7 @@ extract_kbc1126ec() mv Rompaq/68*.BIN ec.bin || : if [ ! -f ec.bin ]; then unar -D ROM.CAB Rom.bin || unar -D Rom.CAB Rom.bin || \ - x_ unar -D 68*.CAB Rom.bin + unar -D 68*.CAB Rom.bin || err "can't extract Rom.bin" x_ mv Rom.bin ec.bin fi [ -f ec.bin ] || err "extract_kbc1126_ec ${board}: can't extract" @@ -203,7 +203,8 @@ extract_kbc1126ec() done [ "${ec_ex}" = "y" ] || \ err "extract_kbc1126_ec ${board}: didn't extract ecfw1/2.bin" - x_ cp "${appdir}/"ec.bin.fw* "${_dest%/*}/" + cp "${appdir}/"ec.bin.fw* "${_dest%/*}/" || \ + err "extract_kbc1126_ec ${board}: can't copy ec binaries" } extract_e6400vga() @@ -221,7 +222,8 @@ extract_e6400vga() [ -f "${E6400_VGA_romname}" ] || \ err "extract_e6400vga: can't extract vga rom from bios.bin" ) - x_ cp "${appdir}/${E6400_VGA_romname}" "${_dest}" + cp "${appdir}/${E6400_VGA_romname}" "${_dest}" || \ + err "extract_e6400vga ${board}: can't copy vga rom to ${_dest}" } extract_sch5545ec() |