From 02919c47ced4f02b17d873906f63e790a2a74dc1 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 20 May 2023 18:10:41 +0100 Subject: build/grub: implement error handling it uses a subshell, so errors weren't observed Signed-off-by: Leah Rowe --- resources/scripts/build/module/grub | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/resources/scripts/build/module/grub b/resources/scripts/build/module/grub index 1fdd7a26..4d466a68 100755 --- a/resources/scripts/build/module/grub +++ b/resources/scripts/build/module/grub @@ -27,25 +27,35 @@ main() printf "Building GRUB\n" if [ ! -d "grub/" ]; then - ./download grub + ./download grub || exit 1 fi + + build_grub } build_grub() { ( - cd grub/ + cd grub/ || err "cd" # clean up first - [ -d Makefile ] && make distclean + if [ -d Makefile ]; then + make distclean || err "make-distclean" + fi - ./bootstrap --gnulib-srcdir=gnulib/ --no-git + ./bootstrap --gnulib-srcdir=gnulib/ --no-git || err "bootstrap" # build - ./autogen.sh - ./configure --with-platform=coreboot - make -j$(nproc) + ./autogen.sh || err "autogen" + ./configure --with-platform=coreboot || err "configure" + make -j$(nproc) || err "make" ) } +err() +{ + printf "%s: error: %s\n" $0 $1 + exit 1 +} + main $@ -- cgit v1.2.1