diff options
| author | Leah Rowe <leah@libreboot.org> | 2025-05-18 13:25:37 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2025-05-18 13:25:37 +0100 |
| commit | 158c56072c075231eec3422b653f01ddaa451ab6 (patch) | |
| tree | 6417cafccf4f5f20602e01c3c83b2619e55bbfd9 | |
| parent | 5f022acbf47724adead781136d866e8220a83e6d (diff) | |
init.sh: merge xbmk_mkdirs with set_env
it's just two lines, and they relate.
Signed-off-by: Leah Rowe <leah@libreboot.org>
| -rw-r--r-- | include/init.sh | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/include/init.sh b/include/init.sh index ac145f56..1791ef78 100644 --- a/include/init.sh +++ b/include/init.sh @@ -30,8 +30,8 @@ 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 init_cmd in get_version set_env lock git_init \ - mkdirs set_pyver child_exec; do + for init_cmd in get_version set_env lock git_init set_pyver child_exec + do xbmk_$init_cmd "$@" || break done } @@ -114,6 +114,9 @@ xbmk_set_env() xbmk_set_version export LOCALVERSION="-$projectname-${version%%-*}" + + remkdir "$xbmktmp" "$xbmklocal" + remkdir "$XBMK_CACHE/gnupath" "$XBMK_CACHE/xbmkpath" } xbmk_lock() @@ -156,12 +159,6 @@ xbmk_git_init() 2>/dev/null; : } -xbmk_mkdirs() -{ - remkdir "$xbmktmp" "$xbmklocal" - remkdir "$XBMK_CACHE/gnupath" "$XBMK_CACHE/xbmkpath" -} - xbmk_set_pyver() { pyv="import sys; print(sys.version_info[:])" |