From 11cd952060d0e8c915b5d9ce456029ae3cd98125 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 26 Apr 2025 22:41:05 +0100 Subject: init.sh: tidy up xbmk_init() more version-related code moved to xbmk_set_version Signed-off-by: Leah Rowe --- include/init.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/init.sh b/include/init.sh index b7f79936..c6956086 100644 --- a/include/init.sh +++ b/include/init.sh @@ -53,10 +53,6 @@ xbmk_init() id -u 1>/dev/null 2>/dev/null || $err "suid check failed (id -u)" [ "$(id -u)" != "0" ] || $err "this command as root is not permitted" - for fv in version versiondate; do - eval "[ ! -f \".$fv\" ] || read -r $fv < \".$fv\" || :" - done - for init_cmd in set_pyver set_env set_version git_init create_tmpdir \ lock create_pathdirs child_exec; do xbmk_$init_cmd "$@" || break @@ -165,6 +161,10 @@ xbmk_set_env() xbmk_set_version() { + for fv in version versiondate; do + eval "[ ! -f \".$fv\" ] || read -r $fv < \".$fv\" || :" + done + [ -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