summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2025-01-03 15:56:41 +0000
committerLeah Rowe <leah@libreboot.org>2025-01-03 15:56:41 +0000
commita73b0fd910a249c60d25dce7ab289ab53a4a07df (patch)
treef708a4750a10a9b26c2246d5e6a27810764724fb
parentec6bcc1fba5fbdf8b19b3d1cf9711f3d4c9c3741 (diff)
Revert "fix more unescaped quotes in eval"
This reverts commit ec6bcc1fba5fbdf8b19b3d1cf9711f3d4c9c3741.
-rwxr-xr-xbuild2
-rw-r--r--include/lib.sh2
-rwxr-xr-xscript/trees2
3 files changed, 3 insertions, 3 deletions
diff --git a/build b/build
index 05fa0445..2fab248b 100755
--- a/build
+++ b/build
@@ -25,7 +25,7 @@ main()
for g in "command -v git" "git config --global user.name" \
"git config --global user.email" "git_init"; do
- eval "\"$g\" 1>/dev/null 2>/dev/null || $err \"FAILED: $g\""
+ eval "$g 1>/dev/null 2>/dev/null || $err \"Unconfigured: $g\""
done
case "${spath#script/}" in
diff --git a/include/lib.sh b/include/lib.sh
index 857857d2..2b630797 100644
--- a/include/lib.sh
+++ b/include/lib.sh
@@ -40,7 +40,7 @@ setvars()
chkvars()
{
for var in "$@"; do
- eval "[ -n \"\${$var+x}\" ] || \$err \"$var unset\""
+ eval "[ -n "\${$var+x}" ] || \$err \"$var unset\""
eval "[ -n \"\$$var\" ] || \$err \"$var unset\""
done; return 0
}
diff --git a/script/trees b/script/trees
index 1ff94562..e674282c 100755
--- a/script/trees
+++ b/script/trees
@@ -266,7 +266,7 @@ check_gnu_path()
gnu_setver()
{
- eval "\"$2\" --version 1>/dev/null 2>/dev/null || return 1"
+ eval "$2 --version 1>/dev/null 2>/dev/null || return 1"
eval "$1ver=\"`"$2" --version 2>/dev/null | head -n1`\""
eval "$1ver=\"\${$1ver##* }\""
eval "$1full=\"\$$1ver\""