From ec6bcc1fba5fbdf8b19b3d1cf9711f3d4c9c3741 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Fri, 3 Jan 2025 15:43:27 +0000 Subject: fix more unescaped quotes in eval it should fix more build errors that might have appeared in the aforementioned revision, mentioned in the previous commit message Signed-off-by: Leah Rowe --- build | 2 +- include/lib.sh | 2 +- script/trees | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build b/build index 2fab248b..05fa0445 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 \"Unconfigured: $g\"" + eval "\"$g\" 1>/dev/null 2>/dev/null || $err \"FAILED: $g\"" done case "${spath#script/}" in diff --git a/include/lib.sh b/include/lib.sh index 2b630797..857857d2 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 e674282c..1ff94562 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\"" -- cgit v1.2.1