mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-07-11 05:52:36 +02:00
init.sh: define lock file in a variable instead
don't hardcode it. Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
+6
-4
@@ -17,12 +17,14 @@ xbmkpath="$PATH"
|
|||||||
xbmk_err="err_"
|
xbmk_err="err_"
|
||||||
|
|
||||||
eval "`setvars "" _nogit board reinstall versiondate aur_notice configdir \
|
eval "`setvars "" _nogit board reinstall versiondate aur_notice configdir \
|
||||||
datadir version xbmkpwd relname xbmkpwd xbmktmp python pyver xbmklocal`"
|
datadir version xbmkpwd relname xbmkpwd xbmktmp python pyver xbmklocal \
|
||||||
|
xbmklock`"
|
||||||
|
|
||||||
xbmk_init()
|
xbmk_init()
|
||||||
{
|
{
|
||||||
xbmkpwd="`pwd`" || err "Cannot generate PWD"
|
xbmkpwd="`pwd`" || err "Cannot generate PWD"
|
||||||
xbmklocal="$xbmkpwd/tmp"
|
xbmklocal="$xbmkpwd/tmp"
|
||||||
|
xbmklock="$xbmkpwd/lock"
|
||||||
|
|
||||||
export PWD="$xbmkpwd"
|
export PWD="$xbmkpwd"
|
||||||
|
|
||||||
@@ -184,8 +186,8 @@ xbmk_create_tmpdir()
|
|||||||
|
|
||||||
xbmk_lock()
|
xbmk_lock()
|
||||||
{
|
{
|
||||||
[ -f "lock" ] && err "$xbmkpwd/lock exists. Is a build running?"
|
[ -f "$xbmklock" ] && err "$xbmklock exists. Is a build running?"
|
||||||
touch lock || err "cannot create 'lock' file"; :
|
touch "$xbmklock" || err "cannot create '$xbmklock'"; :
|
||||||
}
|
}
|
||||||
|
|
||||||
xbmk_create_pathdirs()
|
xbmk_create_pathdirs()
|
||||||
@@ -205,7 +207,7 @@ xbmk_child_exec()
|
|||||||
xbmk_rval=0
|
xbmk_rval=0
|
||||||
( x_ ./mk "$@" ) || xbmk_rval=1
|
( x_ ./mk "$@" ) || xbmk_rval=1
|
||||||
( x_ rm -Rf "$xbmklocal" "$xbmktmp" ) || xbmk_rval=1
|
( x_ rm -Rf "$xbmklocal" "$xbmktmp" ) || xbmk_rval=1
|
||||||
( x_ rm -f lock ) || xbmk_rval=1
|
( x_ rm -f "$xbmklock" ) || xbmk_rval=1
|
||||||
exit $xbmk_rval
|
exit $xbmk_rval
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user