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

init.sh: merge xbmk_lock() with xbmk_set_env() 

it's just two lines, and we want much more granular
control of where the lock is enforced. it should be
JUST after confirming that the instance is a parent.

it is at this moment that we should bail if a lock
file exists, because this signals that another instance
of xbmk is running.

Signed-off-by: Leah Rowe <leah@libreboot.org>
25.06_branch
Leah Rowe 2025-05-18 13:32:24 +01:00
parent 1c34d4567b
commit addbd95a24
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/init.sh
View File

@ -30,8 +30,7 @@ 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 child_exec
do
for init_cmd in get_version set_env git_init child_exec; do
xbmk_$init_cmd "$@" || break
done
}
@ -82,6 +81,9 @@ xbmk_set_env()
return 1
fi
[ -f "$xbmklock" ] && err "'$xbmklock' exists. Is a build running?"
touch "$xbmklock" || err "cannot create '$xbmklock'"; :
# parent instance of xbmk, so don't return. set up TMPDIR
export TMPDIR="/tmp"
export TMPDIR="$(mktemp -d -t xbmk_XXXXXXXX)"
@ -189,12 +191,6 @@ pybin()
command -v "$1" 2>/dev/null || return 1
}
xbmk_lock()
{
[ -f "$xbmklock" ] && err "'$xbmklock' exists. Is a build running?"
touch "$xbmklock" || err "cannot create '$xbmklock'"; :
}
xbmk_git_init()
{
for gitarg in "--global user.name" "--global user.email"; do