From 075902c3ea770985ee093dee3dc2252501dd37a7 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Thu, 17 Apr 2025 04:49:17 +0100 Subject: simplify a few file checks the combination of x_ with the "e" function enables for much simpler file-check error handling, which is a unique innovation of lbmk as it pertains to sh. Signed-off-by: Leah Rowe --- mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'mk') diff --git a/mk b/mk index 84778600..8460773e 100755 --- a/mk +++ b/mk @@ -163,7 +163,7 @@ trees() return 1 fi - [ -f "config/git/$project/pkg.cfg" ] || $err "'$project' not defined" + x_ e "config/git/$project/pkg.cfg" f for d in "elf" "config/data" "config" "src"; do eval "${d#*/}dir=\"$d/$project\"" @@ -249,10 +249,9 @@ configure_project() xarch xlang badhash`" _tcfg="$1/target.cfg" [ -f "$_tcfg" ] || btype="auto" - [ -f "$datadir/mkhelper.cfg" ] && \ - eval "`setcfg "$datadir/mkhelper.cfg"`" + e "$datadir/mkhelper.cfg" f && eval "`setcfg "$datadir/mkhelper.cfg"`" - while [ -f "$_tcfg" ] || [ "$cmd" != "build_project" ]; do + while e "$_tcfg" f || [ "$cmd" != "build_project" ]; do eval "`setvars "" rev tree`" eval "`setcfg "$_tcfg"`" printf "Loading %s config: %s\n" "$project" "$_tcfg" -- cgit v1.2.1