From 0e2c56be4133eb4be62ad3eaa7490573a24ab2fd Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 28 Apr 2024 20:40:41 +0100 Subject: build/roms: reduce indentation in skip_board() Signed-off-by: Leah Rowe --- script/build/roms | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'script') diff --git a/script/build/roms b/script/build/roms index b84fd3b1..f41f812b 100755 --- a/script/build/roms +++ b/script/build/roms @@ -168,27 +168,27 @@ skip_board() printf "WARNING: %s not stable (status=%s):\n\n" \ "$board" "$status" - [ "$release" = "n" ] && [ "$lbmk_release" = "y" ] && \ - return 0 + [ "$lbmk_release" = "y" ] && [ "$release" = "n" ] && return 0 + [ "$lbmk_release" = "y" ] && [ "$status" = "broken" ] && return 0 - if [ "$lbmk_release" != "y" ] && [ "$status" != "stable" ] && \ - [ "$lbmk_status" = "y" ]; then - if [ -f "$targetdir/warn.txt" ]; then - printf "Regarding board '%s' (status '%s'):\n" \ - "$board" "$status" - cat -u "$targetdir/warn.txt" || \ - $err "!cat $targetdir/warn.txt" - fi - printf "\nTo disable this dialog when building, do:\n" - printf "export LBMK_STATUS=n\n\n" - while true; do - printf "Board %s has status '%s'. Skip? [y/n]" \ - "$board" "$status" - read -r skip - [ "$skip" = "y" ] && return 0 - [ "$skip" = "n" ] && return 1; continue - done - fi; return 1 + [ "$lbmk_status" = "y" ] || return 1 + [ "$status" = "stable" ] && return 1 + + if [ -f "$targetdir/warn.txt" ]; then + printf "Regarding board '%s' (status '%s'):\n" \ + "$board" "$status" + cat -u "$targetdir/warn.txt" || \ + $err "!cat $targetdir/warn.txt" + fi + printf "\nTo disable this dialog when building, do:\n" + printf "export LBMK_STATUS=n\n\n" + while true; do + printf "Board %s has status '%s'. Skip? [y/n]" \ + "$board" "$status" + read -r skip + [ "$skip" = "y" ] && return 0 + [ "$skip" = "n" ] && return 1; continue + done } build_payloads() -- cgit v1.2.1