canoeboot
/
cbmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

init.sh: move xbmk_set_version 

it's called before set_pyver, so move it above that

Signed-off-by: Leah Rowe <leah@libreboot.org>
master
Leah Rowe 2025-05-18 13:29:51 +01:00
parent a4103517ea
commit 1c34d4567b
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
include/init.sh
View File

@ -121,6 +121,21 @@ xbmk_set_env()
xbmk_set_pyver xbmk_set_pyver
} }
xbmk_set_version()
{
version_="$version"
[ ! -e ".git" ] || version="$(git describe --tags HEAD 2>&1)" || \
version="git-$(git rev-parse HEAD 2>&1)" || version="$version_"
versiondate_="$versiondate"
[ ! -e ".git" ] || versiondate="$(git show --no-patch --no-notes \
--pretty='%ct' HEAD)" || versiondate="$versiondate_"
chkvars version versiondate
update_xbmkver "."
relname="$projectname-$version"
}
xbmk_set_pyver() xbmk_set_pyver()
{ {
pyv="import sys; print(sys.version_info[:])" pyv="import sys; print(sys.version_info[:])"
@ -180,21 +195,6 @@ xbmk_lock()
touch "$xbmklock" || err "cannot create '$xbmklock'"; : touch "$xbmklock" || err "cannot create '$xbmklock'"; :
} }
xbmk_set_version()
{
version_="$version"
[ ! -e ".git" ] || version="$(git describe --tags HEAD 2>&1)" || \
version="git-$(git rev-parse HEAD 2>&1)" || version="$version_"
versiondate_="$versiondate"
[ ! -e ".git" ] || versiondate="$(git show --no-patch --no-notes \
--pretty='%ct' HEAD)" || versiondate="$versiondate_"
chkvars version versiondate
update_xbmkver "."
relname="$projectname-$version"
}
xbmk_git_init() xbmk_git_init()
{ {
for gitarg in "--global user.name" "--global user.email"; do for gitarg in "--global user.name" "--global user.email"; do