From f4b2a588e27f1bc8d13ed1f31c68590bd76dcf4f Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Wed, 8 Nov 2023 06:05:49 +0000 Subject: build: don't generate version/versiondate as root don't run it directly at the bottom of err.sh, because otherwise the version and versiondate files will be generated when running "./build dependencies distroname" which would then create these files, but as root because the user runs that specific command as root. the rest of lbmk, for any other command, prevents use of the root account, so running check_project during "./build dependencies distroname" will cause the build system to fail (because as non-root user, the user will run lbmk and it will try to update those files, and fail because it can't, due to lack of permissions) this patch fixes the issue, by only generating those files if the user is *not* root Signed-off-by: Leah Rowe --- build | 7 ++++++- include/err.sh | 2 -- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build b/build index 8c9f8f9c..0d9fcf46 100755 --- a/build +++ b/build @@ -43,7 +43,10 @@ main() { xx_ id -u 1>/dev/null 2>/dev/null [ $# -lt 1 ] && fail "Too few arguments. Try: ${0} help" - [ "${1}" = "dependencies" ] && xx_ install_packages $@ && lbmk_exit 0 + if [ "${1}" = "dependencies" ]; then + xx_ install_packages $@ + lbmk_exit 0 + fi initialise_command $@ && shift 1 @@ -59,6 +62,8 @@ initialise_command() { [ "$(id -u)" != "0" ] || fail "this command as root is not permitted" + check_project + case "${1}" in help) usage ${0} && lbmk_exit 0 ;; list) items "${buildpath}" && lbmk_exit 0 ;; diff --git a/include/err.sh b/include/err.sh index 33246d12..595d6c77 100755 --- a/include/err.sh +++ b/include/err.sh @@ -78,5 +78,3 @@ err() printf "ERROR %s: %s\n" "${0}" "${1}" 1>&2 exit 1 } - -check_project -- cgit v1.2.1