diff options
| author | Leah Rowe <leah@libreboot.org> | 2025-05-05 20:38:19 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2025-05-05 20:38:19 +0100 |
| commit | 17d826d3a9614fea2bc87d8203b7f07fe4b7fb54 (patch) | |
| tree | a5d4cd6c90bfcf17acca851b733386e9fc5e5353 | |
| parent | f98e34a24dd21ebafbfac2e019d3a4bc1cf500cb (diff) | |
lbmk: Replace err with much simpler implementation
The current implementation is insanely over-engineered,
and completely unnecessary.
Signed-off-by: Leah Rowe <leah@libreboot.org>
| -rw-r--r-- | include/init.sh | 2 | ||||
| -rw-r--r-- | include/inject.sh | 1 | ||||
| -rw-r--r-- | include/lib.sh | 22 |
3 files changed, 0 insertions, 25 deletions
diff --git a/include/init.sh b/include/init.sh index 8f5ab059..1be860ea 100644 --- a/include/init.sh +++ b/include/init.sh @@ -14,8 +14,6 @@ projectsite="https://libreboot.org/" export PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games" xbmkpath="$PATH" -xbmk_err="err_" - eval "`setvars "" _nogit board reinstall versiondate aur_notice configdir \ datadir version xbmkpwd relname xbmkpwd xbmktmp python pyver xbmklocal \ xbmklock`" diff --git a/include/inject.sh b/include/inject.sh index 6aceb52c..6caf8500 100644 --- a/include/inject.sh +++ b/include/inject.sh @@ -270,7 +270,6 @@ fail_inject() inject() { need_files="n" - xbmk_err="fail_inject" remkdir "$tmpromdel" set +u +e diff --git a/include/lib.sh b/include/lib.sh index 2c28b112..e83170ee 100644 --- a/include/lib.sh +++ b/include/lib.sh @@ -184,28 +184,6 @@ x_() err() { set -u -e - - xbmk_err_val=0 - real_err="" && [ -n "${xbmk_err+x}" ] && real_err="$xbmk_err" - - if [ -z "$real_err" ]; then - printf "WARNING: err not set. Defaulting to 'err_'\n" 1>&2 - real_err="err_" - fi - - ( - $real_err "$@" || err_ "Error function '$real_err' *returned* 1" - err_ "Error function '$real_err' didn't exit" - exit 1 # just in case! - ) || xbmk_err_val=1 # otherwise, it wrongly did exit 0, not exit 1 - - [ $xbmk_err_val -eq 0 ] && err_ "Error function '$real_err' did exit 0" - exit 1 # just in case! -} - -err_() -{ - [ $# -lt 1 ] && printf "ERROR (but no error message provided)\n" 1>&2 [ $# -lt 1 ] || printf "ERROR %s: %s\n" "$0" "$1" 1>&2 || : exit 1 } |