coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-24 02:04:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

build/descriptors: simplify and fix error handling

Browse Source 
main() on top

some parts of the script weren't erroring properly

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2023-05-20 18:19:35 +01:00
parent a05be16998
commit 187d5fa418
1 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/scripts/build/descriptors/ich9m
+27 -20
View File
@@ -1,6 +1,6 @@
#!/usr/bin/env sh #!/usr/bin/env sh
# Copyright (C) 2020 Leah Rowe <info@minifree.org> # Copyright (C) 2020, 2023 Leah Rowe <info@minifree.org>
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@@ -16,29 +16,36 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
# This script assumes that the current working directory is the root
# of libreboot_src or libreboot git
[ "x${DEBUG+set}" = 'xset' ] && set -v [ "x${DEBUG+set}" = 'xset' ] && set -v
set -u -e set -u -e
if [ ! -f "util/ich9utils/ich9gen" ]; then ich9gen="util/ich9utils/ich9gen"
main()
{
if [ ! -f "${ich9gen}" ]; then
( (
cd util/ich9utils/ cd util/ich9utils/ || err "cd"
make clean make clean || err "make-clean"
make -j$(nproc) make -j$(nproc) || err "make"
) )
fi fi
if [ ! -f "util/ich9utils/ich9gen" ]; then [ ! -f "${ich9gen}" ] && \
printf "build/descriptors/ich9m: ich9gen wasn't compiled. Exiting\n" err "ich9gen doesn't exist"
[ -d "descriptors/ich9m/" ] || mkdir -p "descriptors/ich9m/"
rm -f descriptors/ich9m/* || err "rm-rf"
(
cd descriptors/ich9m/ || err "cd2"
../../"${ich9gen}" || err "ich9gen"
)
}
err()
{
printf "%s: %s\n" $0 $1
exit 1 exit 1
fi }
[ -d "descriptors/" ] || mkdir -p "descriptors/" main $@
[ -d "descriptors/ich9m/" ] || mkdir -p "descriptors/ich9m/"
rm -f descriptors/ich9m/*
(
cd descriptors/ich9m/
../../util/ich9utils/ich9gen
)