diff options
| author | Leah Rowe <leah@libreboot.org> | 2025-04-26 22:23:37 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2025-04-26 22:23:37 +0100 |
| commit | ec1c92238ccaceab59102dbf0ede8f63bc0ef433 (patch) | |
| tree | 4d6efeaa158834513c86a74c4b27b6384c78bd4b | |
| parent | e009f09e7fafec2e0ed1d3f729f19d9a5c91a4ff (diff) | |
init.sh: minor cleanup
Signed-off-by: Leah Rowe <leah@libreboot.org>
| -rw-r--r-- | include/init.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/init.sh b/include/init.sh index 5b158e0e..973eee6f 100644 --- a/include/init.sh +++ b/include/init.sh @@ -57,7 +57,7 @@ xbmk_init() eval "[ ! -f \".$fv\" ] || read -r $fv < \".$fv\" || :" done - for init_cmd in set_pyver init_vars init_ver create_tmpdir lock \ + for init_cmd in set_pyver set_env set_version create_tmpdir lock \ create_pathdirs child_exec; do xbmk_$init_cmd "$@" || break done @@ -143,7 +143,7 @@ pybin() command -v "$1" 2>/dev/null || return 1 } -xbmk_init_vars() +xbmk_set_env() { # XBMK_CACHE is a directory, for caching downloads and git repon [ -z "${XBMK_CACHE+x}" ] && export XBMK_CACHE="$xbmkpwd/cache" @@ -160,16 +160,16 @@ xbmk_init_vars() [ -z "${XBMK_THREADS+x}" ] && export XBMK_THREADS=1 expr "X$XBMK_THREADS" : "X-\{0,1\}[0123456789][0123456789]*$" \ - 1>/dev/null 2>/dev/null || export XBMK_THREADS=1 + 1>/dev/null 2>/dev/null || export XBMK_THREADS=1; : +} +xbmk_set_version() +{ [ -e ".git" ] || [ -f ".version" ] || printf "unknown\n" > .version \ || $err "Cannot generate unknown .version file" [ -e ".git" ] || [ -f ".versiondate" ] || printf "1716415872\n" > \ .versiondate || $err "Cannot generate unknown .versiondate file"; : -} -xbmk_init_ver() -{ version_="$version" [ ! -e ".git" ] || version="$(git describe --tags HEAD 2>&1)" || \ version="git-$(git rev-parse HEAD 2>&1)" || version="$version_" |