canoeboot
/
cbmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "fix more unescaped quotes in eval" 

This reverts commit ec6bcc1fba5fbdf8b19b3d1cf9711f3d4c9c3741.
master
Leah Rowe 2025-01-03 15:56:41 +00:00
parent c1dd3da298
commit 9baf6a72a7
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build
View File

@ -23,7 +23,7 @@ main()
for g in "command -v git" "git config --global user.name" \ for g in "command -v git" "git config --global user.name" \
"git config --global user.email" "git_init"; do "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 done
case "${spath#script/}" in case "${spath#script/}" in

2
include/lib.sh
View File

@ -40,7 +40,7 @@ setvars()
chkvars() chkvars()
{ {
for var in "$@"; do for var in "$@"; do
eval "[ -n \"\${$var+x}\" ] || \$err \"$var unset\"" eval "[ -n "\${$var+x}" ] || \$err \"$var unset\""
eval "[ -n \"\$$var\" ] || \$err \"$var unset\"" eval "[ -n \"\$$var\" ] || \$err \"$var unset\""
done; return 0 done; return 0
} }

2
script/trees
View File

@ -266,7 +266,7 @@ check_gnu_path()
gnu_setver() 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=\"`"$2" --version 2>/dev/null | head -n1`\""
eval "$1ver=\"\${$1ver##* }\"" eval "$1ver=\"\${$1ver##* }\""
eval "$1full=\"\$$1ver\"" eval "$1full=\"\$$1ver\""