From 2ae565ba93a84add3dd891e31e894d61cd4be42b Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Fri, 2 May 2025 05:54:36 +0100
Subject: init.sh: move setvars/err_ to lib.sh

these functions make more sense in lib.sh

i made mk link lib.sh first, so that the
functions on init.sh can still use them.

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 include/init.sh | 21 ---------------------
 1 file changed, 21 deletions(-)

(limited to 'include/init.sh')

diff --git a/include/init.sh b/include/init.sh
index 1b8432ce..c06d937a 100644
--- a/include/init.sh
+++ b/include/init.sh
@@ -16,27 +16,6 @@ xbmkpath="$PATH"
 
 err="err_"
 
-setvars()
-{
-	_setvars=""
-	if [ $# -lt 2 ]; then
-		printf "\$err \"setvars: too few args\\n\""
-		return 0
-	fi
-	val="$1"
-	shift 1
-	for var in "$@"; do
-		_setvars="$var=\"$val\"; $_setvars"
-	done
-	printf "%s\n" "${_setvars% }"
-}
-
-err_()
-{
-	printf "ERROR %s: %s\n" "$0" "$1" 1>&2
-	exit 1
-}
-
 eval "`setvars "" _nogit board reinstall versiondate aur_notice configdir \
     datadir version xbmkpwd relname xbmkpwd xbmktmp python pyver`"
 
-- 
cgit v1.2.1


From 6c4d88f2686558ef910bed2ebcc024d0347076fd Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Fri, 2 May 2025 07:24:11 +0100
Subject: move x_() to lib.sh

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 include/init.sh | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'include/init.sh')

diff --git a/include/init.sh b/include/init.sh
index c06d937a..b8839921 100644
--- a/include/init.sh
+++ b/include/init.sh
@@ -224,9 +224,4 @@ xbmk_child_exec()
 	exit $xbmk_rval
 }
 
-x_()
-{
-	[ $# -lt 1 ] || "$@" || $err "Unhandled error for: $(echo "$@")"; :
-}
-
 xbmk_init "$@"
-- 
cgit v1.2.1


From fcc52b986e7612d8bb53e9b51f305c62f611a35b Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sat, 3 May 2025 05:32:01 +0100
Subject: init.sh: unified handling of ./tmp

not to be confused with /tmp

we use ./tmp inside the lbmk work directory, for large files,
because /tmp might not be very big, or might be a tmpfs

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 include/init.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'include/init.sh')

diff --git a/include/init.sh b/include/init.sh
index b8839921..9e0e3a37 100644
--- a/include/init.sh
+++ b/include/init.sh
@@ -194,6 +194,10 @@ xbmk_create_tmpdir()
 	export TMPDIR="/tmp"
 	export TMPDIR="$(mktemp -d -t xbmk_XXXXXXXX)"
 	xbmktmp="$TMPDIR"
+
+	# /tmp might be a tmpfs, so for large files we use ./tmp,
+	# not to be confused with xbmktmp (xbmktmp points to /tmp)
+	x_ mkdir -p tmp
 }
 
 xbmk_lock()
@@ -219,7 +223,7 @@ xbmk_child_exec()
 {
 	xbmk_rval=0
 	( x_ ./mk "$@" ) || xbmk_rval=1
-	rm -Rf "$xbmktmp" || xbmk_rval=1
+	rm -Rf tmp "$xbmktmp" || xbmk_rval=1
 	rm -f lock || xbmk_rval=1
 	exit $xbmk_rval
 }
-- 
cgit v1.2.1


From 0ffaf5c7331ae0fac9db8cf8a2b670e156fad7e9 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sat, 3 May 2025 05:33:02 +0100
Subject: init.sh: Explicitly create the xbmktmp directory

mktemp would normally do it, but we must not rely on that

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 include/init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/init.sh')

diff --git a/include/init.sh b/include/init.sh
index 9e0e3a37..c40894a1 100644
--- a/include/init.sh
+++ b/include/init.sh
@@ -197,7 +197,7 @@ xbmk_create_tmpdir()
 
 	# /tmp might be a tmpfs, so for large files we use ./tmp,
 	# not to be confused with xbmktmp (xbmktmp points to /tmp)
-	x_ mkdir -p tmp
+	x_ mkdir -p "$xbmktmp" tmp
 }
 
 xbmk_lock()
-- 
cgit v1.2.1


From 00d22f20829251f55cd2e859d6fae9a61220c072 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sat, 3 May 2025 06:53:25 +0100
Subject: lbmk: Unified local ./tmp handling

Make it an absolute directory, relative to xbmktmp.

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 include/init.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'include/init.sh')

diff --git a/include/init.sh b/include/init.sh
index c40894a1..a5180d07 100644
--- a/include/init.sh
+++ b/include/init.sh
@@ -17,11 +17,13 @@ xbmkpath="$PATH"
 err="err_"
 
 eval "`setvars "" _nogit board reinstall versiondate aur_notice configdir \
-    datadir version xbmkpwd relname xbmkpwd xbmktmp python pyver`"
+    datadir version xbmkpwd relname xbmkpwd xbmktmp python pyver xbmklocal`"
 
 xbmk_init()
 {
 	xbmkpwd="`pwd`" || $err "Cannot generate PWD"
+	xbmklocal="$xbmkpwd/tmp"
+
 	export PWD="$xbmkpwd"
 
 	if [ $# -gt 0 ] && [ "$1" = "dependencies" ]; then
@@ -197,7 +199,7 @@ xbmk_create_tmpdir()
 
 	# /tmp might be a tmpfs, so for large files we use ./tmp,
 	# not to be confused with xbmktmp (xbmktmp points to /tmp)
-	x_ mkdir -p "$xbmktmp" tmp
+	x_ mkdir -p "$xbmktmp" "$xbmklocal"
 }
 
 xbmk_lock()
@@ -223,7 +225,7 @@ xbmk_child_exec()
 {
 	xbmk_rval=0
 	( x_ ./mk "$@" ) || xbmk_rval=1
-	rm -Rf tmp "$xbmktmp" || xbmk_rval=1
+	rm -Rf "$xbmklocal" "$xbmktmp" || xbmk_rval=1
 	rm -f lock || xbmk_rval=1
 	exit $xbmk_rval
 }
-- 
cgit v1.2.1


From 498f5a26cc82db8063c37876058091e1b1279d45 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sat, 3 May 2025 07:04:34 +0100
Subject: init.sh: Always create xbmklocal

If we're in a release work directory, TMPDIR is already
set, so the local ./tmp won't be created, which would
lead to an error.

Fix it by creating xbmklocal before checking TMPDIR.

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 include/init.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include/init.sh')

diff --git a/include/init.sh b/include/init.sh
index a5180d07..c4650576 100644
--- a/include/init.sh
+++ b/include/init.sh
@@ -186,6 +186,8 @@ xbmk_git_init()
 
 xbmk_create_tmpdir()
 {
+	x_ mkdir -p "$xbmklocal"
+
 	# unify all temporary files/directories in a single TMPDIR
 	[ -z "${TMPDIR+x}" ] || [ "${TMPDIR%_*}" = "/tmp/xbmk" ] || \
 	    unset TMPDIR
-- 
cgit v1.2.1


From 530e4109a2b4ad2d26c3e29eda652e2ab180cf84 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sat, 3 May 2025 07:05:38 +0100
Subject: init.sh: *Re-create* tmpdirs on parent instance

To make sure any old files are removed, always re-create.

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 include/init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/init.sh')

diff --git a/include/init.sh b/include/init.sh
index c4650576..3f813ea7 100644
--- a/include/init.sh
+++ b/include/init.sh
@@ -201,7 +201,7 @@ xbmk_create_tmpdir()
 
 	# /tmp might be a tmpfs, so for large files we use ./tmp,
 	# not to be confused with xbmktmp (xbmktmp points to /tmp)
-	x_ mkdir -p "$xbmktmp" "$xbmklocal"
+	remkdir "$xbmktmp" "$xbmklocal"
 }
 
 xbmk_lock()
-- 
cgit v1.2.1


From b6a2dc4ea3ca18bff174014d1724aebd5dc28b84 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 4 May 2025 08:10:36 +0100
Subject: init.sh: tidy up pathdir creation

we can use remkdir here. it does the same thing.

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 include/init.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'include/init.sh')

diff --git a/include/init.sh b/include/init.sh
index 3f813ea7..7026594a 100644
--- a/include/init.sh
+++ b/include/init.sh
@@ -212,8 +212,7 @@ xbmk_lock()
 
 xbmk_create_pathdirs()
 {
-	x_ rm -Rf "$XBMK_CACHE/xbmkpath" "$XBMK_CACHE/gnupath"
-	x_ mkdir -p "$XBMK_CACHE/gnupath" "$XBMK_CACHE/xbmkpath"
+	remkdir "$XBMK_CACHE/gnupath" "$XBMK_CACHE/xbmkpath"
 	export PATH="$XBMK_CACHE/xbmkpath:$XBMK_CACHE/gnupath:$PATH"
 	(
 	# set up python v3.x in PATH, in case it's not set up correctly.
-- 
cgit v1.2.1


From 7acec7a3a1d40a38b88b56e9c56087da263f30d1 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 4 May 2025 08:29:19 +0100
Subject: init.sh: simplify dependencies handling

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 include/init.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'include/init.sh')

diff --git a/include/init.sh b/include/init.sh
index 7026594a..fc321605 100644
--- a/include/init.sh
+++ b/include/init.sh
@@ -26,10 +26,7 @@ xbmk_init()
 
 	export PWD="$xbmkpwd"
 
-	if [ $# -gt 0 ] && [ "$1" = "dependencies" ]; then
-		install_packages "$@" || exit 1
-		exit 0
-	fi
+	[ $# -gt 0 ] && [ "$1" = "dependencies" ] && x_ xbmkpkg "$@" && exit 0
 
 	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"
@@ -40,7 +37,7 @@ xbmk_init()
 	done
 }
 
-install_packages()
+xbmkpkg()
 {
 	[ $# -lt 2 ] && $err "fewer than two arguments"
 	[ $# -gt 2 ] && reinstall="$3"
-- 
cgit v1.2.1


From 7392f6fc8ecbff10661be6ae66306afd89f1a3e3 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 4 May 2025 08:33:17 +0100
Subject: init.sh: move non-init functions to lib.sh

these were missed in a previous cleanup

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 include/init.sh | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'include/init.sh')

diff --git a/include/init.sh b/include/init.sh
index fc321605..4807e1cf 100644
--- a/include/init.sh
+++ b/include/init.sh
@@ -51,22 +51,6 @@ xbmkpkg()
 	    printf "You need AUR packages: %s\n" "$aur_notice" 1>&2; :
 }
 
-setcfg()
-{
-	[ $# -gt 1 ] && printf "e \"%s\" f missing && return %s;\n" "$1" "$2"
-	[ $# -gt 1 ] || \
-		printf "e \"%s\" f not && %s \"Missing config\";\n" "$1" "$err"
-	printf ". \"%s\" || %s \"Could not read config\";\n" "$1" "$err"
-}
-
-chkvars()
-{
-	for var in "$@"; do
-		eval "[ -n \"\${$var+x}\" ] || \$err \"$var unset\""
-		eval "[ -n \"\$$var\" ] || \$err \"$var unset\""
-	done; :
-}
-
 xbmk_set_pyver()
 {
 	pyv="import sys; print(sys.version_info[:])"
-- 
cgit v1.2.1


From 6e447876cca283434163328ce08b6e9d0b5a1d24 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 4 May 2025 08:47:12 +0100
Subject: init.sh: tidy up the python version check

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 include/init.sh | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'include/init.sh')

diff --git a/include/init.sh b/include/init.sh
index 4807e1cf..9f6e7162 100644
--- a/include/init.sh
+++ b/include/init.sh
@@ -60,11 +60,9 @@ xbmk_set_pyver()
 	pybin "$python" 1>/dev/null || pyver=""
 	[ -z "$pyver" ] || "`pybin "$python"`" -c "$pyv" 1>/dev/null \
 	    2>/dev/null || $err "Cannot detect host Python version."
-	if [ -n "$pyver" ]; then
-		pyver="$("$(pybin "$python")" -c "$pyv" | awk '{print $1}')"
-		pyver="${pyver#(}"
-		pyver="${pyver%,}"
-	fi
+	[ -n "$pyver" ] && \
+	    pyver="$("$(pybin "$python")" -c "$pyv" | awk '{print $1}')" && \
+	    pyver="${pyver#(}" && pyver="${pyver%,}"
 	[ "${pyver%%.*}" = "3" ] || $err "Bad python version (must by 3.x)"; :
 }
 
@@ -94,8 +92,7 @@ pybin()
 		[ -e "$pypath/$1" ] && [ ! -d "$pypath/$1" ] && \
 		    [ -x "$pypath/$1" ] && printf "%s/%s\n" "$pypath" "$1" && \
 		    return 0
-	done
-	[ $venv -gt 0 ] && return 1
+	done && return 1
 
 	# Defer to normal command -v if not a venv
 	command -v "$1" 2>/dev/null || return 1
-- 
cgit v1.2.1


From 54291ebb7209c314bb52f507bc6a1ecf2a28fbc9 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 4 May 2025 09:56:21 +0100
Subject: lbmk: MUCH safer err function

Don't directly call a variable. Call a function that
checks the variable instead.

The new err function also checks whether an exit was
actually done, and exits 1 if not.

If an exit was done by the given function, but the exit
was zero, this is also corrected to perform an exit 1.

This fixes a longstanding design flaw of lbmk.

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 include/init.sh | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'include/init.sh')

diff --git a/include/init.sh b/include/init.sh
index 9f6e7162..ce9cf9a9 100644
--- a/include/init.sh
+++ b/include/init.sh
@@ -14,22 +14,22 @@ projectsite="https://libreboot.org/"
     export PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games"
 xbmkpath="$PATH"
 
-err="err_"
+xbmk_err="err_"
 
 eval "`setvars "" _nogit board reinstall versiondate aur_notice configdir \
     datadir version xbmkpwd relname xbmkpwd xbmktmp python pyver xbmklocal`"
 
 xbmk_init()
 {
-	xbmkpwd="`pwd`" || $err "Cannot generate PWD"
+	xbmkpwd="`pwd`" || err "Cannot generate PWD"
 	xbmklocal="$xbmkpwd/tmp"
 
 	export PWD="$xbmkpwd"
 
 	[ $# -gt 0 ] && [ "$1" = "dependencies" ] && x_ xbmkpkg "$@" && exit 0
 
-	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 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 set_pyver set_env set_version git_init create_tmpdir \
 	    lock create_pathdirs child_exec; do
@@ -39,13 +39,13 @@ xbmk_init()
 
 xbmkpkg()
 {
-	[ $# -lt 2 ] && $err "fewer than two arguments"
+	[ $# -lt 2 ] && err "fewer than two arguments"
 	[ $# -gt 2 ] && reinstall="$3"
 
 	eval "`setcfg "config/dependencies/$2"`"
 
 	chkvars pkg_add pkglist
-	$pkg_add $pkglist || $err "Cannot install packages"
+	$pkg_add $pkglist || err "Cannot install packages"
 
 	[ -n "$aur_notice" ] && \
 	    printf "You need AUR packages: %s\n" "$aur_notice" 1>&2; :
@@ -59,11 +59,11 @@ xbmk_set_pyver()
 	pyver="2" && [ "$python" = "python3" ] && pyver="3"
 	pybin "$python" 1>/dev/null || pyver=""
 	[ -z "$pyver" ] || "`pybin "$python"`" -c "$pyv" 1>/dev/null \
-	    2>/dev/null || $err "Cannot detect host Python version."
+	    2>/dev/null || err "Cannot detect host Python version."
 	[ -n "$pyver" ] && \
 	    pyver="$("$(pybin "$python")" -c "$pyv" | awk '{print $1}')" && \
 	    pyver="${pyver#(}" && pyver="${pyver%,}"
-	[ "${pyver%%.*}" = "3" ] || $err "Bad python version (must by 3.x)"; :
+	[ "${pyver%%.*}" = "3" ] || err "Bad python version (must by 3.x)"; :
 }
 
 # Use direct path, to prevent a hang if Python is using a virtual environment,
@@ -104,9 +104,9 @@ xbmk_set_env()
 	[ -z "${XBMK_CACHE+x}" ] && export XBMK_CACHE="$xbmkpwd/cache"
 	[ -z "$XBMK_CACHE" ] && export XBMK_CACHE="$xbmkpwd/cache"
 	[ -L "$XBMK_CACHE" ] && [ "$XBMK_CACHE" = "$xbmkpwd/cache" ] && \
-	    $err "cachedir '$xbmkpwd/cache' is a symlink"
+	    err "cachedir '$xbmkpwd/cache' is a symlink"
 	[ -L "$XBMK_CACHE" ] && export XBMK_CACHE="$xbmkpwd/cache"
-	[ -f "$XBMK_CACHE" ] && $err "cachedir '$XBMK_CACHE' is a file"; :
+	[ -f "$XBMK_CACHE" ] && err "cachedir '$XBMK_CACHE' is a file"; :
 
 	# if "y": a coreboot target won't be built if target.cfg says release="n"
 	# (this is used to exclude certain build targets from releases)
@@ -124,9 +124,9 @@ xbmk_set_version()
 	[ ! -f ".versiondate" ] || read -r versiondate < ".versiondate" || :; :
 
 	[ -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" > \
-	    ".versiondate" || $err "Can't generate unknown versiondate file"; :
+	    ".versiondate" || err "Can't generate unknown versiondate file"; :
 
 	version_="$version"
 	[ ! -e ".git" ] || version="$(git describe --tags HEAD 2>&1)" || \
@@ -136,8 +136,8 @@ xbmk_set_version()
 	    --pretty='%ct' HEAD)" || versiondate="$versiondate_"
 
 	chkvars version versiondate
-	printf "%s\n" "$version" > ".version" || $err "can't save version"
-	printf "%s\n" "$versiondate" > ".versiondate" || $err "can't save date"
+	printf "%s\n" "$version" > ".version" || err "can't save version"
+	printf "%s\n" "$versiondate" > ".versiondate" || err "can't save date"
 
 	relname="$projectname-$version"
 	export LOCALVERSION="-$projectname-${version%%-*}"
@@ -157,7 +157,7 @@ xbmk_git_init()
 	    2>/dev/null
 
 	for gitarg in "--global user.name" "--global user.email"; do
-		gitcmd="git config $gitarg"; $gitcmd || $err \
+		gitcmd="git config $gitarg"; $gitcmd || err \
 		    "Please run this first: $gitcmd \"your ${gitcmd##*.}\""
 	done
 }
@@ -184,8 +184,8 @@ xbmk_create_tmpdir()
 
 xbmk_lock()
 {
-	[ -f "lock" ] && $err "$xbmkpwd/lock exists. Is a build running?"
-	touch lock || $err "cannot create 'lock' file"; :
+	[ -f "lock" ] && err "$xbmkpwd/lock exists. Is a build running?"
+	touch lock || err "cannot create 'lock' file"; :
 }
 
 xbmk_create_pathdirs()
@@ -195,9 +195,9 @@ xbmk_create_pathdirs()
 	(
 	# set up python v3.x in PATH, in case it's not set up correctly.
 	# see code above that detected the correct python3 command.
-	cd "$XBMK_CACHE/xbmkpath" || $err "can't cd $XBMK_CACHE/xbmkpath"
+	cd "$XBMK_CACHE/xbmkpath" || err "can't cd $XBMK_CACHE/xbmkpath"
 	x_ ln -s "`pybin "$python"`" python
-	) || $err "Can't set up python symlink in $XBMK_CACHE/xbmkpath"; :
+	) || err "Can't set up python symlink in $XBMK_CACHE/xbmkpath"; :
 }
 
 xbmk_child_exec()
-- 
cgit v1.2.1


From 9611c19e7ed1be42c8da8228235d9626eb853acf Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 4 May 2025 16:03:34 +0100
Subject: init.sh: tidy up xbmk_child_exec()

make the command style more consistent, for example
relying on x_ inside a subshell to print the command
and arguments if a command failed.

this is a good style, and i'll probably use it in other
places on lbmk.

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 include/init.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include/init.sh')

diff --git a/include/init.sh b/include/init.sh
index ce9cf9a9..e8ff6b63 100644
--- a/include/init.sh
+++ b/include/init.sh
@@ -204,8 +204,8 @@ xbmk_child_exec()
 {
 	xbmk_rval=0
 	( x_ ./mk "$@" ) || xbmk_rval=1
-	rm -Rf "$xbmklocal" "$xbmktmp" || xbmk_rval=1
-	rm -f lock || xbmk_rval=1
+	( x_ rm -Rf "$xbmklocal" "$xbmktmp" ) || xbmk_rval=1
+	( x_ rm -f lock ) || xbmk_rval=1
 	exit $xbmk_rval
 }
 
-- 
cgit v1.2.1


From 8b7bd992f66d554c50495fb87426bf3b8580dcb9 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 4 May 2025 16:12:23 +0100
Subject: init.sh: define lock file in a variable instead

don't hardcode it.

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 include/init.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'include/init.sh')

diff --git a/include/init.sh b/include/init.sh
index e8ff6b63..9e05d503 100644
--- a/include/init.sh
+++ b/include/init.sh
@@ -17,12 +17,14 @@ xbmkpath="$PATH"
 xbmk_err="err_"
 
 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()
 {
 	xbmkpwd="`pwd`" || err "Cannot generate PWD"
 	xbmklocal="$xbmkpwd/tmp"
+	xbmklock="$xbmkpwd/lock"
 
 	export PWD="$xbmkpwd"
 
@@ -184,8 +186,8 @@ xbmk_create_tmpdir()
 
 xbmk_lock()
 {
-	[ -f "lock" ] && err "$xbmkpwd/lock exists. Is a build running?"
-	touch lock || err "cannot create 'lock' file"; :
+	[ -f "$xbmklock" ] && err "$xbmklock exists. Is a build running?"
+	touch "$xbmklock" || err "cannot create '$xbmklock'"; :
 }
 
 xbmk_create_pathdirs()
@@ -205,7 +207,7 @@ xbmk_child_exec()
 	xbmk_rval=0
 	( x_ ./mk "$@" ) || 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
 }
 
-- 
cgit v1.2.1


From b51846da6dead8f138858dcdb3da0b78d713e580 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 4 May 2025 16:14:50 +0100
Subject: init.sh: single-quote xbmklock in xbmk_lock()

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 include/init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/init.sh')

diff --git a/include/init.sh b/include/init.sh
index 9e05d503..349d40ed 100644
--- a/include/init.sh
+++ b/include/init.sh
@@ -186,7 +186,7 @@ xbmk_create_tmpdir()
 
 xbmk_lock()
 {
-	[ -f "$xbmklock" ] && err "$xbmklock exists. Is a build running?"
+	[ -f "$xbmklock" ] && err "'$xbmklock' exists. Is a build running?"
 	touch "$xbmklock" || err "cannot create '$xbmklock'"; :
 }
 
-- 
cgit v1.2.1


From 5e3aaa1eb8b6f0198723ca67cda07b0990744132 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 4 May 2025 16:49:30 +0100
Subject: init.sh: Run git name/email check before init

Otherwise, it returns if init is already done, which
later leads to build errors in coreboot.

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 include/init.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'include/init.sh')

diff --git a/include/init.sh b/include/init.sh
index 349d40ed..b9df34bb 100644
--- a/include/init.sh
+++ b/include/init.sh
@@ -147,6 +147,11 @@ xbmk_set_version()
 
 xbmk_git_init()
 {
+	for gitarg in "--global user.name" "--global user.email"; do
+		gitcmd="git config $gitarg"; $gitcmd || err \
+		    "Please run this first: $gitcmd \"your ${gitcmd##*.}\""
+	done
+
 	[ -L ".git" ] && return 1
 	[ -e ".git" ] && return 0
 	eval "`setvars "$(date -Rud @$versiondate)" cdate _nogit`"
@@ -156,12 +161,7 @@ xbmk_git_init()
 	x_ git commit -m "$projectname $version" --date "$cdate" \
 	    --author="xbmk <xbmk@example.com>" 1>/dev/null 2>/dev/null
 	x_ git tag -a "$version" -m "$projectname $version" 1>/dev/null \
-	    2>/dev/null
-
-	for gitarg in "--global user.name" "--global user.email"; do
-		gitcmd="git config $gitarg"; $gitcmd || err \
-		    "Please run this first: $gitcmd \"your ${gitcmd##*.}\""
-	done
+	    2>/dev/null; :
 }
 
 xbmk_create_tmpdir()
-- 
cgit v1.2.1


From 35265731c5b1bfef4bd4e94722c67be8284c7d64 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 4 May 2025 16:50:50 +0100
Subject: init.sh: Silence the output of git config --global

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 include/init.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include/init.sh')

diff --git a/include/init.sh b/include/init.sh
index b9df34bb..8f5ab059 100644
--- a/include/init.sh
+++ b/include/init.sh
@@ -148,8 +148,8 @@ xbmk_set_version()
 xbmk_git_init()
 {
 	for gitarg in "--global user.name" "--global user.email"; do
-		gitcmd="git config $gitarg"; $gitcmd || err \
-		    "Please run this first: $gitcmd \"your ${gitcmd##*.}\""
+		gitcmd="git config $gitarg"; $gitcmd 1>/dev/null 2>/dev/null \
+		    || err "Run this first: $gitcmd \"your ${gitcmd##*.}\""
 	done
 
 	[ -L ".git" ] && return 1
-- 
cgit v1.2.1