From fbd464b4f795b82990edad4901f6812b10ca3260 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Wed, 4 Oct 2023 08:06:10 +0100 Subject: include/err.sh: checkgit,checkversion call these as functions, instead of executing scripts Signed-off-by: Leah Rowe --- lbmk | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'lbmk') diff --git a/lbmk b/lbmk index f4544418..6ccf4db5 100755 --- a/lbmk +++ b/lbmk @@ -12,12 +12,10 @@ set -u -e . "include/export.sh" . "include/option.sh" -read projectname < projectname linkpath="${0}" linkname="${linkpath##*/}" buildpath="./script/${linkname}" -mode="" -option="" +eval "$(setvars "" mode option project version versiondate)" main() { @@ -25,8 +23,8 @@ main() initialise_command $@ shift 2 - ./checkgit || fail "Please read: https://libreboot.org/docs/build/" - ./checkversion || fail "Cannot check ${projectname} version" + check_git + check_project execute_command $@ lbmk_exit 0 @@ -101,7 +99,7 @@ usage() Example: ./build grub list, which would yield: $(./build grub list) - Refer to ${projectname} documentation for more info. + Refer to ${project} documentation for more info. EOF } -- cgit v1.2.1