From 79ded40f3d0f123ce2dbddba524aaae76764c699 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 26 May 2025 13:45:12 +0100 Subject: lib.sh: simplify chkvars() Signed-off-by: Leah Rowe --- include/lib.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'include/lib.sh') diff --git a/include/lib.sh b/include/lib.sh index 7c4d71ea..822f1abc 100644 --- a/include/lib.sh +++ b/include/lib.sh @@ -71,11 +71,9 @@ setcfg() chkvars() { - while true; do - [ $# -lt 1 ] && break + while [ $# -gt 0 ]; do eval "[ -n \"\${$1+x}\" ] || err \"$1 unset\"" - eval "[ -n \"\$$1\" ] || err \"$1 unset\"" - shift 1 + eval "[ -n \"\$$1\" ] || err \"$1 unset\"; shift 1; :" done; : } -- cgit v1.2.1 From dee6997d0cc13e95b9a911efef0687b0ac582edd Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 26 May 2025 13:49:55 +0100 Subject: lib.sh: simplify setvars() Signed-off-by: Leah Rowe --- include/lib.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'include/lib.sh') diff --git a/include/lib.sh b/include/lib.sh index 822f1abc..86c0df26 100644 --- a/include/lib.sh +++ b/include/lib.sh @@ -53,12 +53,10 @@ setvars() fi val="$1" shift 1 - while true; do - [ $# -lt 1 ] && break - _setvars="$1=\"$val\"; $_setvars" + while [ $# -gt 0 ]; do + printf "%s=\"%s\"\n" "$1" "$val" shift 1 done - printf "%s\n" "${_setvars% }" } setcfg() -- cgit v1.2.1 From dc6996252a0f516add85e0cbcf1693bfa80f8c99 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Tue, 27 May 2025 10:11:42 +0100 Subject: put coreboot utils in elf/coreboot/TREE not elf/UTIL/TREE This way, they are automatically deleted when a tree has to be re-built. Signed-off-by: Leah Rowe --- include/lib.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/lib.sh') diff --git a/include/lib.sh b/include/lib.sh index 86c0df26..b40772fa 100644 --- a/include/lib.sh +++ b/include/lib.sh @@ -4,8 +4,8 @@ # Copyright (c) 2020-2025 Leah Rowe # Copyright (c) 2025 Alper Nebi Yasak -cbfstool="elf/cbfstool/default/cbfstool" -rmodtool="elf/cbfstool/default/rmodtool" +cbfstool="elf/coreboot/default/cbfstool" +rmodtool="elf/coreboot/default/rmodtool" remkdir() { -- cgit v1.2.1