diff options
| author | Leah Rowe <leah@libreboot.org> | 2025-10-04 05:23:47 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2025-10-04 05:23:47 +0100 |
| commit | 7f8d85140fd229e97e539ca463fbd94545997fd6 (patch) | |
| tree | 88528dba20c0c08fcb2aa0e84fc4d9be28d6febf /include/inject.sh | |
| parent | 0a74cc8ec6038492f64074e18cc10ba7ab31ac94 (diff) | |
xbmk: remove the setcfg function
this allows me to remove several eval calls, and the
errors relating to configs can now show exactly which
function they occured in, allowing for easier debugging.
once again, eval should be used sparingly if at all.
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'include/inject.sh')
| -rw-r--r-- | include/inject.sh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/inject.sh b/include/inject.sh index ac5739c6..9f30b0a0 100644 --- a/include/inject.sh +++ b/include/inject.sh @@ -115,7 +115,9 @@ check_target() boarddir="$cbcfgsdir/$board" - eval "`setcfg "$boarddir/target.cfg"`" + . "$boarddir/target.cfg" || \ + err "Can't read '$boarddir/target.cfg'" "check_target" "$@" + chkvars tree x_ ./mk -d coreboot "$tree" @@ -160,7 +162,13 @@ readkconfig() x_ rm -f "$xbtmp/cbcfg" fx_ scankconfig x_ find "$boarddir/config" -type f - eval "`setcfg "$xbtmp/cbcfg" 1`" + + if e "$xbtmp/cbcfg" f missing; then + return 1 + fi + + . "$xbtmp/cbcfg" || \ + err "Can't read '$xbtmp/cbcfg'" "readkconfig" "$@" if ! setvfile "$@"; then return 1 |