diff --git a/build b/build
index 6f435b68..3194397f 100755
--- a/build
+++ b/build
@@ -25,7 +25,7 @@ main()
 	spath="script/$1"; shcmd="shift 1"
 	[ "${1#-*}" != "$1" ] && spath="script/trees" && shcmd=":"
 
-	for g in "which 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
 		eval "$g 1>/dev/null 2>/dev/null || $err \"Unconfigured: $g\""
 	done
diff --git a/include/lib.sh b/include/lib.sh
index f0126457..ef54f143 100644
--- a/include/lib.sh
+++ b/include/lib.sh
@@ -16,8 +16,8 @@ err="err_"
 
 pyver="2"
 python="python3"
-which python3 1>/dev/null || python="python"
-which $python 1>/dev/null || pyver=""
+command -v python3 1>/dev/null || python="python"
+command -v $python 1>/dev/null || pyver=""
 [ -n "$pyver" ] && pyver="$($python --version | awk '{print $2}')"
 if [ "${pyver%%.*}" != "3" ]; then
 	printf "Wrong python version, or python missing. Must be v 3.x.\n" 1>&2