diff options
author | Leah Rowe <leah@libreboot.org> | 2025-10-04 16:14:36 +0100 |
---|---|---|
committer | Leah Rowe <leah@libreboot.org> | 2025-10-04 16:14:36 +0100 |
commit | 2956fcc0516d2db11294a05e9f21b1d8b73c8e63 (patch) | |
tree | a866afd8f9aafaa24f2c7f887980efbda71b9cc8 | |
parent | 8334c93dac9d6d601c9ae3e585195f0171513293 (diff) |
vendor.sh: fix setvfile
this reverts change made to this function in:
commit 4f01dc704a1ed0e18fc0efc1500e61b4bc41b0e6
Author: Leah Rowe <leah@libreboot.org>
Date: Sat Oct 4 06:13:15 2025 +0100
xbmk: remove even more eval statements
for some reason, the new code caused sch5545 ec firmware
to never download.
the old code wasn't horribly broken, so just use that.
Signed-off-by: Leah Rowe <leah@libreboot.org>
-rw-r--r-- | include/vendor.sh | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/vendor.sh b/include/vendor.sh index a0806dd8..2a3ea26a 100644 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -491,12 +491,8 @@ extract_fsp() setvfile() { [ -n "$vcfg" ] && for c in $checkvarschk; do - vcmd="[ \"\${$c}\" = \"/dev/null\" ] || [ -z \"\${$c}\" ]" - eval "$vcmd || return 0" - - if getvfile "$@"; then - return 0 - fi + vcmd="[ \"\${$c}\" != \"/dev/null\" ] && [ -n \"\${$c}\" ]" + eval "$vcmd && getvfile \"\$@\" && return 0" done && return 1; : } |