diff options
| author | Leah Rowe <leah@libreboot.org> | 2025-04-26 22:41:05 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2025-04-26 22:41:05 +0100 |
| commit | 11cd952060d0e8c915b5d9ce456029ae3cd98125 (patch) | |
| tree | 8bd52ee9312662e2397b3fbd1743b72bcc6bcdbf | |
| parent | f6c5c8d396d3e5b317f19e66ca23049a06949969 (diff) | |
init.sh: tidy up xbmk_init()
more version-related code moved to xbmk_set_version
Signed-off-by: Leah Rowe <leah@libreboot.org>
| -rw-r--r-- | include/init.sh | 8 |
1 files 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" > \ |