coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-25 07:46:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

init.sh: merge xbmk_child_init with xbmk_init

Browse Source 
the for loop at the end of xbmk_init does essentially
the same thing. adapt accordingly, and merge.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2025-04-26 22:02:26 +01:00
parent 1526820247
commit 18ad654a1f
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/init.sh
+7 -13
View File
@@ -51,8 +51,9 @@ xbmk_init()
eval "[ ! -f \".$fv\" ] || read -r $fv < \".$fv\" || :" eval "[ ! -f \".$fv\" ] || read -r $fv < \".$fv\" || :"
done done
for xbmk_cmd in setpyver init_vars init_ver xbmk_child_init; do for init_cmd in set_pyver init_vars init_ver create_tmpdir lock \
$xbmk_cmd "$@" create_pathdirs child_exec; do
xbmk_$init_cmd "$@" || break
done done
} }
@@ -86,7 +87,7 @@ chkvars()
done; : done; :
} }
setpyver() xbmk_set_pyver()
{ {
pyv="import sys; print(sys.version_info[:])" pyv="import sys; print(sys.version_info[:])"
python="python3" python="python3"
@@ -136,7 +137,7 @@ pybin()
command -v "$1" 2>/dev/null || return 1 command -v "$1" 2>/dev/null || return 1
} }
init_vars() xbmk_init_vars()
{ {
# XBMK_CACHE is a directory, for caching downloads and git repon # XBMK_CACHE is a directory, for caching downloads and git repon
[ -z "${XBMK_CACHE+x}" ] && export XBMK_CACHE="$xbmkpwd/cache" [ -z "${XBMK_CACHE+x}" ] && export XBMK_CACHE="$xbmkpwd/cache"
@@ -158,10 +159,10 @@ init_vars()
[ -e ".git" ] || [ -f ".version" ] || printf "unknown\n" > .version \ [ -e ".git" ] || [ -f ".version" ] || printf "unknown\n" > .version \
|| $err "Cannot generate unknown .version file" || $err "Cannot generate unknown .version file"
[ -e ".git" ] || [ -f ".versiondate" ] || printf "1716415872\n" > \ [ -e ".git" ] || [ -f ".versiondate" ] || printf "1716415872\n" > \
.versiondate || $err "Cannot generate unknown .versiondate file" .versiondate || $err "Cannot generate unknown .versiondate file"; :
} }
init_ver() xbmk_init_ver()
{ {
version_="$version" version_="$version"
[ ! -e ".git" ] || version="$(git describe --tags HEAD 2>&1)" || \ [ ! -e ".git" ] || version="$(git describe --tags HEAD 2>&1)" || \
@@ -178,13 +179,6 @@ init_ver()
export LOCALVERSION="-$projectname-${version%%-*}" export LOCALVERSION="-$projectname-${version%%-*}"
} }
xbmk_child_init()
{
for init_cmd in create_tmpdir lock create_pathdirs child_exec; do
xbmk_$init_cmd "$@" || return 0; :
done
}
xbmk_create_tmpdir() xbmk_create_tmpdir()
{ {
# unify all temporary files/directories in a single TMPDIR # unify all temporary files/directories in a single TMPDIR