mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-07-17 18:34:57 +02:00
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>
This commit is contained in:
Vendored
+6
-4
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user