diff --git a/build b/build
index cc0737a..3f213d8 100755
--- a/build
+++ b/build
@@ -23,7 +23,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 2b63079..857857d 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 e674282..1ff9456 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\""