diff options
| author | Leah Rowe <leah@libreboot.org> | 2023-12-24 09:04:36 +0000 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2023-12-24 09:04:36 +0000 |
| commit | 0aca6332ee5865dbf4717235cbf9f5e8e79dddc3 (patch) | |
| tree | cbb2a18ec22213208ab3dcaf22eebbb84fb14e5e /script/vendor/inject | |
| parent | 575332f2219c9e6f435b7ed35bfb2a408de0628c (diff) | |
lbmk scripts: shorter code lines
while seemingly pedantic, this does actually make code
easier to read. mostly just switching to shorthand for
variable names, where no expansions or patterns are used
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'script/vendor/inject')
| -rwxr-xr-x | script/vendor/inject | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/script/vendor/inject b/script/vendor/inject index 3f75a9da..cec19b2e 100755 --- a/script/vendor/inject +++ b/script/vendor/inject @@ -37,7 +37,7 @@ main() inject_vendorfiles [ "${nukemode}" = "nuke" ] && return 0 printf "Friendly reminder (this is *not* an error message):\n" - printf "Please always ensure that the files were inserted correctly.\n" + printf "Please ensure that the files were inserted correctly.\n" } check_board() @@ -96,7 +96,7 @@ build_dependencies() if [ ! -f "${cbfstool}" ] || [ ! -f "${ifdtool}" ]; then x_ ./update trees -b coreboot utils default fi - [ -z "${new_mac}" ] || [ -f "${nvmutil}" ] || x_ make -C util/nvmutil + [ -z "$new_mac" ] || [ -f "$nvmutil" ] || x_ make -C util/nvmutil [ "${nukemode}" = "nuke" ] && return 0 x_ ./vendor download ${board} } @@ -116,7 +116,7 @@ patch_release_roms() _tmpdir="tmp/romdir" remkdir "${_tmpdir}" tar -xf "${archive}" -C "${_tmpdir}" || \ - err "patch_release_roms: !tar -xf \"${archive}\" -C \"${_tmpdir}\"" + err "patch_release_roms: !tar -xf \"$archive\" -C \"$_tmpdir\"" for x in "${_tmpdir}"/bin/*/*.rom ; do printf "patching rom: %s\n" "$x" @@ -208,20 +208,20 @@ inject() fi if [ "${cbfsname}" = "IFD" ]; then if [ "${nukemode}" != "nuke" ]; then - "${ifdtool}" -i ${_t}:${_dest} "${rom}" -O "$rom" || \ + "$ifdtool" -i ${_t}:${_dest} "$rom" -O "$rom" || \ err "inject: can't insert $_t ($dest) into $rom" else - "${ifdtool}" --nuke ${_t} "${rom}" -O "${rom}" || \ - err "inject ${rom}: can't nuke ${_t} in IFD" + "$ifdtool" --nuke $_t "$rom" -O "$rom" || \ + err "inject $rom: can't nuke $_t in IFD" fi else if [ "${nukemode}" != "nuke" ]; then - "${cbfstool}" "${rom}" add -f "${_dest}" \ - -n "${cbfsname}" -t ${_t} ${_offset} || \ + "$cbfstool" "$rom" add -f "$_dest" \ + -n "$cbfsname" -t $_t $_offset || \ err "inject $rom: can't insert $_t file $_dest" else - "${cbfstool}" "${rom}" remove -n "${cbfsname}" || \ - err "inject $rom: can't remove ${cbfsname}" + "$cbfstool" "$rom" remove -n "$cbfsname" || \ + err "inject $rom: can't remove $cbfsname" fi fi |