From 5af3ae0586ba1f437cecab551ab4fba6fb6bdef1 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Wed, 8 Nov 2023 06:31:04 +0000 Subject: lbmk: don't use status for unconditional returns in cases where lbmk must always return from a function, there are some cases where it relies on non-zero exit status, which in practise is always the case, but may change in the future if the relevant part is modified e.g. do_something && return 0 the proper form is: do_something return 0 also do this for unconditional exits Signed-off-by: Leah Rowe --- script/build/roms | 15 ++++++++++----- script/build/serprog | 5 ++++- 2 files changed, 14 insertions(+), 6 deletions(-) (limited to 'script/build') diff --git a/script/build/roms b/script/build/roms index ff50d9b7..a96ad89b 100755 --- a/script/build/roms +++ b/script/build/roms @@ -31,8 +31,12 @@ main() { while [ $# -gt 0 ]; do case ${1} in - help) usage && exit 0 ;; - list) items config/coreboot && exit 0 ;; + help) + usage + exit 0 ;; + list) + items config/coreboot || : + exit 0 ;; -d) _displaymode="${2}" ;; -p) _payload="${2}" ;; -k) _keyboard="${2}" ;; @@ -216,10 +220,11 @@ build_target() build_roms() { cbcfg="${1}" - [ ! -f "${cbcfg}" ] && \ + if [ ! -f "${cbcfg}" ]; then printf "'%s' does not exist. Skipping build for %s %s %s\n" \ - "${cbcfg}" "${board}" "${displaymode}" "${initmode}" \ - 1>&2 && return 0 + "${cbcfg}" "${board}" "${displaymode}" "${initmode}" 1>&2 + return 0 + fi x_ ./update trees -b coreboot ${board} diff --git a/script/build/serprog b/script/build/serprog index 93ea9302..7f8664a9 100755 --- a/script/build/serprog +++ b/script/build/serprog @@ -34,7 +34,10 @@ main() x_ mkdir -p "bin/serprog_${platform}" if [ $# -gt 1 ] ; then - [ "${2}" = "list" ] && print_boards ${boards_dir} && return 0 + if [ "${2}" = "list" ]; then + print_boards ${boards_dir} + return 0 + fi build_${platform}_rom "${2}" else printf "Building all serprog targets\n" -- cgit v1.2.1