xbmk: cleanup of recent code refactoring

be a bit less pedantic about if else clauses. leave the
big ones still with then on separate lines, where else
is specified.

also unroll a few condensed code lines where i missed
a few.

sloccount 2303 in lbmk. that's still only slightly bigger
than libreboot 20260907 which was 2180, and still much
smaller than libreboot 20230625 which was 3322.

this is *without* the condensed codelines, so now the only
thing that's reduced is the overall amount of logic present
in the build system.

and i should clarify that lbmk is presently much more powerful
than both of those two versions (20160907/20230625).

the 2016 one is useful for comparison historically, since that
was the last major version of libreboot prior to the great
second coming of leah in 2021; and the 2023 june release was
basically the last one before the great audits of 2023 to
2025 began.

not to brag (not much anyway), but all of this means that lbmk
is an insanely efficient build system, considering all the
features it has and what it does.

i unrolled the condensed code style in lbmk, making the scripts
a lot easier to read, because i received complainst about the
condensed style previously used; nicholas chin and alper nebi
yasak both told me that it sucked, and riku viitanen had hinted
at that same fact several months prior.

so hopefully now, lbmk is a bit nicer. those and other people
often find it challenging to challenge me because for reason
they assume i'll get upset and fly off the handle, but it's the
opposite. i want constant criticism, so that i know to improve!

Signed-off-by: Leah Rowe <leah@libreboot.org>

1 files changed, 34 insertions, 22 deletions

diff --git a/include/vendor.sh b/include/vendor.sh
index 15ae0adf..994f0e3d 100644
--- a/include/vendor.sh
+++ b/include/vendor.sh
@@ -277,37 +277,49 @@ apply_deguard_hack()
 
 extract_archive()
 {
-	innoextract "$1" -d "$2" || python "$pfs_extract" "$1" -e || 7z x \
-	    "$1" -o"$2" || unar "$1" -o "$2" || unzip "$1" -d "$2" || return 1
-
-	[ ! -d "${_dl}_extracted" ] || x_ cp -R "${_dl}_extracted" "$2"; :
-}
-
-extract_kbc1126ec()
-{
-	(
-
-	x_ cd "$appdir/"
-
-	if mv Rompaq/68*.BIN ec.bin; then
+	if innoextract "$1" -d "$2"; then
+		:
+	elif python "$pfs_extract" "$1" -e; then
 		:
-	elif unar -D ROM.CAB Rom.bin; then
+	elif 7z x "$1" -o"$2"; then
 		:
-	elif unar -D Rom.CAB Rom.bin; then
+	elif unar "$1" -o "$2"; then
 		:
-	elif unar -D 68*.CAB Rom.bin; then
+	elif unzip "$1" -d "$2"; then
 		:
 	else
-		err "!kbc1126 unar" "extract_kbc1126ec" "$@"
+		return 1
 	fi
 
-	if [ ! -f "ec.bin" ]; then
-		x_ mv Rom.bin ec.bin
+	if [ -d "${_dl}_extracted" ]; then
+		x_ cp -R "${_dl}_extracted" "$2"
 	fi
+}
 
-	if x_ e ec.bin f; then
-		x_ "$kbc1126_ec_dump" ec.bin
-	fi
+extract_kbc1126ec()
+{
+	(
+		x_ cd "$appdir/"
+
+		if mv Rompaq/68*.BIN ec.bin; then
+			:
+		elif unar -D ROM.CAB Rom.bin; then
+			:
+		elif unar -D Rom.CAB Rom.bin; then
+			:
+		elif unar -D 68*.CAB Rom.bin; then
+			:
+		else
+			err "!kbc1126 unar" "extract_kbc1126ec" "$@"
+		fi
+
+		if [ ! -f "ec.bin" ]; then
+			x_ mv Rom.bin ec.bin
+		fi
+
+		if x_ e ec.bin f; then
+			x_ "$kbc1126_ec_dump" ec.bin
+		fi
 
 	) || err "$board: can't extract kbc1126 fw" "extract_kbc1126ec" "$@"