From fd5431db05dcaa11e45e1e35f987d5cef9ce088f Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 12 Apr 2025 17:40:51 +0100 Subject: lib.sh: define x_ right after err_ because the top-down function order isn't as reliable in lib.sh, since this is what first runs, included in every other script Signed-off-by: Leah Rowe --- include/lib.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/lib.sh b/include/lib.sh index 62bea2c5..ac0003f0 100644 --- a/include/lib.sh +++ b/include/lib.sh @@ -26,6 +26,9 @@ err_() printf "ERROR %s: %s\n" "$0" "$1" 1>&2 exit 1 } +x_() { + [ $# -lt 1 ] || "$@" || $err "Unhandled error for: $(echo "$@")"; : +} xbmkpwd="`pwd`" || $err "Cannot generate PWD" export PWD="$xbmkpwd" @@ -149,10 +152,6 @@ fi expr "X$XBMK_THREADS" : "X-\{0,1\}[0123456789][0123456789]*$" \ 1>/dev/null 2>/dev/null || export XBMK_THREADS=1 # user gave a non-integer -x_() { - [ $# -lt 1 ] || "$@" || $err "Unhandled error for: $(echo "$@")"; : -} - [ -e ".git" ] || [ -f ".version" ] || printf "unknown\n" > .version || \ $err "Cannot generate unknown .version file" [ -e ".git" ] || [ -f ".versiondate" ] || printf "1716415872\n" > \ -- cgit v1.2.1