summaryrefslogtreecommitdiff
path: root/script/update/blobs
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2023-10-03 12:59:35 +0100
committerLeah Rowe <leah@libreboot.org>2023-10-03 12:59:49 +0100
commit5de8eda21c61fd7e1cf6b7e4ec6c9d98dae3e365 (patch)
treeaa0099feff1f80fece4ce4efe16caa74ef905097 /script/update/blobs
parent334aa1f7c985e86bd6f0302dbf404927cbb8a19e (diff)
general code cleanup in shell scripts
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'script/update/blobs')
-rwxr-xr-xscript/update/blobs/download2
-rwxr-xr-xscript/update/blobs/inject17
2 files changed, 7 insertions, 12 deletions
diff --git a/script/update/blobs/download b/script/update/blobs/download
index f1cab1b8..fef6b2c6 100755
--- a/script/update/blobs/download
+++ b/script/update/blobs/download
@@ -147,7 +147,7 @@ extract_e6400vga()
[ -f "${E6400_VGA_romname}" ] || \
err "extract_e6400vga: can't extract vga rom from bios.bin"
)
- x_ cp "${appdir}"/"${E6400_VGA_romname}" "${_dest}"
+ x_ cp "${appdir}/${E6400_VGA_romname}" "${_dest}"
}
extract_sch5545ec()
diff --git a/script/update/blobs/inject b/script/update/blobs/inject
index 99eb9d5b..96ee0002 100755
--- a/script/update/blobs/inject
+++ b/script/update/blobs/inject
@@ -96,13 +96,10 @@ build_dependencies()
inject_blobs()
{
release_archive="n"
- if [ "${release}" = "true" ]; then
- printf "patching release file\n"
- release_archive="y"
- patch_release_roms
- else
- x_ patch_rom "${rom}"
- fi
+ [ "${release}" != "true" ] && x_ patch_rom "${rom}" && return 0
+ printf "patching release file\n"
+ release_archive="y"
+ patch_release_roms
}
patch_release_roms()
@@ -240,11 +237,9 @@ inject_blob_hp_kbc1126_ec()
if [ "${_ec1_offset}" = "" ] || [ "${_ec1_offset}" = "" ]; then
err "inject_blob_hp_kbc1126_ec: ${board}: offset not declared"
- fi
- if [ "${_ec1_location}" = "" ] || [ "${_ec2_location}" = "" ]; then
+ elif [ "${_ec1_location}" = "" ] || [ "${_ec2_location}" = "" ]; then
err "inject_blob_hp_kbc1126_ec: ${board}: EC path not declared"
- fi
- if [ ! -f "${_ec1_location}" ] || [ ! -f "${_ec2_location}" ]; then
+ elif [ ! -f "${_ec1_location}" ] || [ ! -f "${_ec2_location}" ]; then
err "inject_blob_hp_kbc1126_ec: ${board}: ecfw not downloaded"
fi