diff options
| author | Leah Rowe <leah@libreboot.org> | 2026-09-17 11:02:02 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2026-09-17 11:06:12 +0100 |
| commit | a0951d11273491d1ca9c89cf53db91ab03b2fe02 (patch) | |
| tree | f4898762dfa22a66d32adb057f2cb75d864b68fa /include/fw | |
| parent | f59e5d8e2b0339811c4242aa1e1ae8db8bcc8dfd (diff) | |
minor cleanup
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'include/fw')
| -rw-r--r-- | include/fw/inject.sh | 6 | ||||
| -rw-r--r-- | include/fw/rom.sh | 6 | ||||
| -rw-r--r-- | include/fw/vendor.sh | 14 |
3 files changed, 9 insertions, 17 deletions
diff --git a/include/fw/inject.sh b/include/fw/inject.sh index 900d2a5d..98502d3c 100644 --- a/include/fw/inject.sh +++ b/include/fw/inject.sh @@ -44,8 +44,7 @@ inject() check_release if check_target; then - patch_release || \ - return 0; : + patch_release || return 0 fi [ "$xchanged" = "y" ] && \ remktar @@ -84,8 +83,7 @@ check_release() check_target() { - [ "$board" != "${board#serprog_}" ] && \ - return 1 + [ "$board" = "${board#serprog_}" ] || return 1 boarddir="$cbcfgsdir/$board" diff --git a/include/fw/rom.sh b/include/fw/rom.sh index 1dd41e8d..4189ac6b 100644 --- a/include/fw/rom.sh +++ b/include/fw/rom.sh @@ -72,9 +72,8 @@ check_coreboot_util() { [ "$badhash" = "y" ] && \ x_ rm -f "elf/coreboot/$tree/$1" - if e "elf/coreboot/$tree/$1" f; then + e "elf/coreboot/$tree/$1" f && \ return 0 - fi utilelfdir="elf/coreboot/$tree" utilsrcdir="src/coreboot/$tree/util/$1" @@ -124,8 +123,7 @@ mkcorebootbin() mkcorebootbin_real() { - [ "$target" = "$tree" ] && \ - return 0 + [ "$target" = "$tree" ] && return 0 tmprom="$xbtmp/coreboot.rom" diff --git a/include/fw/vendor.sh b/include/fw/vendor.sh index 45cfa19a..95cebb66 100644 --- a/include/fw/vendor.sh +++ b/include/fw/vendor.sh @@ -153,8 +153,7 @@ fetch() ( fx_ "mkdst $binsum" x_ find "${_pre_dest%/*}" -type f ) || : bad_checksum "$binsum" "$_dest" || \ - [ ! -f "$_dest" ] || \ - return 0; : + [ ! -f "$_dest" ] || return 0; : x_ rm -f "$_dest" @@ -380,17 +379,15 @@ setvfile() eval "$vcmd && do_getvfile=\"y\"" [ "$do_getvfile" = "y" ] && \ - if getvfile "$@"; then - return 0 - fi; : + getvfile "$@" && \ + return 0; : done && return 1; : } getvfile() { - if e "config/vendor/$vcfg/pkg.cfg" f missing; then + e "config/vendor/$vcfg/pkg.cfg" f missing && \ return 1 - fi . "config/vendor/$vcfg/pkg.cfg" || \ err "Can't read 'config/vendor/$vcfg/pkg.cfg'" "getvfile" "$@" @@ -442,9 +439,8 @@ prep() [ "$nuke" = "nuke" ] && \ _xromnew="${_xrom%/*}/$vfix${_xrom##*/}" - if e "$_xrom" f missing; then + e "$_xrom" f missing && \ return 0 - fi [ -z "${_xromname#"$vfix"}" ] && \ err "$_xromname / $vfix: name match" "prep" "$@" |