From 62f23123cb2a5ef594f405053d0b111c6e01de87 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 21 Aug 2023 19:41:49 +0100 Subject: general code cleanup on lbmk shell scripts in update/blobs/download, i saw instances where appdir was being deleted with rm -r, but the more appropriate command would rm -Rf. this is now fixed. other than that, i've mostly just simplified a bunch of if statements and consolidated some duplicated logic (e.g. if/else block for dependencies in build_dependencies() of update/blobs/download one or two functions and/or variables have been renamed, for greater clarity in the code, also removed a few messages that were redundant used printf instead of echo, in a few places, also fixed up the indentation in a few places Signed-off-by: Leah Rowe --- resources/scripts/build/grub/utils | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'resources/scripts/build/grub/utils') diff --git a/resources/scripts/build/grub/utils b/resources/scripts/build/grub/utils index edad6b2a..3e379472 100755 --- a/resources/scripts/build/grub/utils +++ b/resources/scripts/build/grub/utils @@ -25,11 +25,7 @@ set -u -e main() { printf "Building GRUB\n" - - if [ ! -d "grub/" ]; then - ./fetch grub || exit 1 - fi - + [ -d "grub/" ] || ./fetch grub || exit 1 build_grub } @@ -37,15 +33,8 @@ build_grub() { ( cd grub/ || err "cd" - - # clean up first - if [ -d Makefile ]; then - make distclean || err "make-distclean" - fi - + [ ! -d Makefile ] || make distclean || err "make-distclean" ./bootstrap --gnulib-srcdir=gnulib/ --no-git || err "bootstrap" - - # build ./autogen.sh || err "autogen" ./configure --with-platform=coreboot || err "configure" make -j$(nproc) || err "make" -- cgit v1.2.1