diff options
| author | Leah Rowe <leah@libreboot.org> | 2023-08-21 19:41:49 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2023-08-21 22:38:00 +0100 |
| commit | 62f23123cb2a5ef594f405053d0b111c6e01de87 (patch) | |
| tree | 74d57d43b7e3cf107c183d273d10dcd5278ab138 /resources/scripts/build/coreboot/utils | |
| parent | 7be4706552845824888b58054120dfac99bfdf63 (diff) | |
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 <leah@libreboot.org>
Diffstat (limited to 'resources/scripts/build/coreboot/utils')
| -rwxr-xr-x | resources/scripts/build/coreboot/utils | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/resources/scripts/build/coreboot/utils b/resources/scripts/build/coreboot/utils index 45739e95..a21da691 100755 --- a/resources/scripts/build/coreboot/utils +++ b/resources/scripts/build/coreboot/utils @@ -39,10 +39,8 @@ main() build_for_mainboard() { board="${1}" - [ ! -d "resources/coreboot/${board}" ] && \ - continue - [ ! -f "resources/coreboot/${board}/target.cfg" ] && \ - continue + [ -d "resources/coreboot/${board}" ] || continue + [ -f "resources/coreboot/${board}/target.cfg" ] || continue tree="undefined" . "resources/coreboot/${board}/target.cfg" # source if [ "${tree}" = "undefined" ]; then @@ -55,15 +53,12 @@ build_for_mainboard() { buildutils() { tree="${1}" - if [ ! -d "coreboot/${tree}/" ]; then + [ -d "coreboot/${tree}/" ] || \ ./fetch_trees coreboot $tree || return 1 - fi for util in cbfstool ifdtool; do - [ -f "cbutils/${tree}/${util}" ] \ - && continue - if [ ! -d "cbutils/${tree}" ]; then + [ -f "cbutils/${tree}/${util}" ] && continue + [ -d "cbutils/${tree}" ] || \ mkdir -p "cbutils/${tree}" || return 1 - fi utildir="coreboot/${tree}/util/${util}" make distclean -C "${utildir}" || return 1 |