summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2025-09-01 07:08:47 +0100
committerLeah Rowe <leah@libreboot.org>2025-09-01 07:08:47 +0100
commit40f064ae336f125762584be8a6ddd52d7ff1cd01 (patch)
tree391f9a56a51714eb1a3d437c2f7d9a0b271108a5 /include
parent24a8226fee0eb320c7b16da94971402b42a7ce87 (diff)
inject/vendor.sh: stricter set + usage
set - as soon as possible, for example in the extract_me function. we only turn off error handling when certain error-prone tasks are performed, and mitigations are in place after these commands run to make sure that the result was valid. this is because in some cases, we want certain buggy behaviours to be permitted, with errors handled in a more fine-tuned way, because sh can sometimes be much stricter depending on the implementation; otherwise, we almost always rely on -e -u in most of the build system. this mainly affects the vendorfile insertion logic. Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'include')
-rw-r--r--include/inject.sh1
-rw-r--r--include/vendor.sh1
2 files changed, 1 insertions, 1 deletions
diff --git a/include/inject.sh b/include/inject.sh
index 621ff131..fa46ee94 100644
--- a/include/inject.sh
+++ b/include/inject.sh
@@ -19,7 +19,6 @@ inject()
{
remkdir "$tmpromdel"
- set +u +e
[ $# -lt 1 ] && err "No options specified"
eval "`setvars "" nuke new_mac xchanged`"
diff --git a/include/vendor.sh b/include/vendor.sh
index 9f1a6ecf..2fc0ff7b 100644
--- a/include/vendor.sh
+++ b/include/vendor.sh
@@ -160,6 +160,7 @@ extract_intel_me()
x_ rm -Rf "$xbmkpwd/metmp"
( fx_ find_me x_ find "$xbmkpwd/$appdir" -type f ) || :; :
+ set -u -e
if [ "$ME11bootguard" = "y" ]; then
apply_deguard_hack