Greatly simplify error handling in shell scripts

Instead of having detailed error messages, run most
commands through a function that calls err() under
fault conditions.

Where detail is still required, err() is still called
manually. Where it isn't, the error message is simply
whatever command was executed to cause the error.

This results in a massive sloccount reduction for lbmk;
specifically, 178 sloc reduction, or a 8.1% reduction.
The total sloccount is now 2022, for shell scripts.

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

2 files changed, 13 insertions, 24 deletions

diff --git a/script/build/grub/payload b/script/build/grub/payload
index 6f4c421a..a1bb3554 100755
--- a/script/build/grub/payload
+++ b/script/build/grub/payload
@@ -22,16 +22,12 @@ main()
 handle_dependencies()
 {
 	[ -d "grub/" ] || \
-		./update project repo grub || \
-		    err "handle_dependencies: cannot fetch grub"
+		x_ ./update project repo grub
 	[ -f "grub/grub-mkstandalone" ] || \
-		./build grub utils || \
-		    err "handle_dependencies: cannot build grub utils"
+		x_ ./build grub utils
 	[ -d "${elfdir}" ] || \
-		mkdir -p "${elfdir}" || \
-		    err "handle_dependencies: cannot mkdir ${elfdir}"
-	rm -f "${elfdir}/"* || \
-	    err "handle_dependencies: cannot rm inside: ${elfdir}/"
+		x_ mkdir -p "${elfdir}"
+	x_ rm -f "${elfdir}/"*
 }
 
 build_keymap_configs()
@@ -40,9 +36,8 @@ build_keymap_configs()
 		[ -f "${keylayoutfile}" ] || continue
 		keymap="${keylayoutfile##${grubcfgsdir}/keymap/}"
 		keymap="${keymap%.gkb}"
-		printf "keymap %s\n" "${keymap}" > \
-		    "${elfdir}/keymap_${keymap}.cfg" || \
-		    err "mk_keymap: can't make ${elfdir}/keymap_${keymap}.cfg"
+		x_ printf "keymap %s\n" "${keymap}" > \
+		    "${elfdir}/keymap_${keymap}.cfg"
 	done
 }
 
diff --git a/script/build/grub/utils b/script/build/grub/utils
index 3c463e6d..edb78bb1 100755
--- a/script/build/grub/utils
+++ b/script/build/grub/utils
@@ -10,25 +10,19 @@ set -u -e
 
 main()
 {
-	[ -d "grub/" ] || ./update project repo grub || err "cannot fetch grub"
+	[ -d "grub/" ] || x_ ./update project repo grub
 	build_grub
 }
 
 build_grub()
 {
 	(
-	cd grub/ || \
-	    err "build_grub: cd"
-	[ ! -d Makefile ] || make distclean || \
-	    err "build_grub: make-distclean"
-	./bootstrap --gnulib-srcdir=gnulib/ --no-git || \
-	    err "build_grub: gnulib bootstrap"
-	./autogen.sh || \
-	    err "build_grub: autogen.sh"
-	./configure --with-platform=coreboot || \
-	    err "build_grub: autoconf"
-	make -j$(nproc) FS_PAYLOAD_MODULES="" || \
-	    err "build_grub: make"
+	x_ cd grub/
+	[ ! -d Makefile ] || x_ make distclean
+	x_ ./bootstrap --gnulib-srcdir=gnulib/ --no-git
+	x_ ./autogen.sh
+	x_ ./configure --with-platform=coreboot
+	x_ make -j$(nproc) FS_PAYLOAD_MODULES=""
 	)
 }