mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-07-21 10:12:04 +02:00
init.sh: tidy up xbmk_init()
more version-related code moved to xbmk_set_version Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
+4
-4
@@ -53,10 +53,6 @@ xbmk_init()
|
|||||||
id -u 1>/dev/null 2>/dev/null || $err "suid check failed (id -u)"
|
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"
|
[ "$(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 \
|
for init_cmd in set_pyver set_env set_version git_init create_tmpdir \
|
||||||
lock create_pathdirs child_exec; do
|
lock create_pathdirs child_exec; do
|
||||||
xbmk_$init_cmd "$@" || break
|
xbmk_$init_cmd "$@" || break
|
||||||
@@ -165,6 +161,10 @@ xbmk_set_env()
|
|||||||
|
|
||||||
xbmk_set_version()
|
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 \
|
[ -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" > \
|
||||||
|
|||||||
Reference in New Issue
Block a user