diff --git a/rpm/setup b/rpm/setup
index 5add7274..a9b4c713 100644
--- a/rpm/setup
+++ b/rpm/setup
@@ -32,7 +32,7 @@ print_status() {
 }
 
 if test -t 1; then # if terminal
-    ncolors=$(which tput > /dev/null && tput colors) # supports color
+    ncolors=$(command -v tput > /dev/null && tput colors) # supports color
     if test -n "$ncolors" && test $ncolors -ge 8; then
         termcols=$(tput cols)
         bold="$(tput bold)"
diff --git a/rpm/setup_0.10 b/rpm/setup_0.10
index 4ff5a092..e4313011 100644
--- a/rpm/setup_0.10
+++ b/rpm/setup_0.10
@@ -32,7 +32,7 @@ print_status() {
 }
 
 if test -t 1; then # if terminal
-    ncolors=$(which tput > /dev/null && tput colors) # supports color
+    ncolors=$(command -v tput > /dev/null && tput colors) # supports color
     if test -n "$ncolors" && test $ncolors -ge 8; then
         termcols=$(tput cols)
         bold="$(tput bold)"
diff --git a/rpm/setup_0.12 b/rpm/setup_0.12
index 0ae87ceb..f8f12e96 100644
--- a/rpm/setup_0.12
+++ b/rpm/setup_0.12
@@ -32,7 +32,7 @@ print_status() {
 }
 
 if test -t 1; then # if terminal
-    ncolors=$(which tput > /dev/null && tput colors) # supports color
+    ncolors=$(command -v tput > /dev/null && tput colors) # supports color
     if test -n "$ncolors" && test $ncolors -ge 8; then
         termcols=$(tput cols)
         bold="$(tput bold)"
diff --git a/rpm/setup_10.x b/rpm/setup_10.x
index aff98bc6..582e1471 100644
--- a/rpm/setup_10.x
+++ b/rpm/setup_10.x
@@ -32,7 +32,7 @@ print_status() {
 }
 
 if test -t 1; then # if terminal
-    ncolors=$(which tput > /dev/null && tput colors) # supports color
+    ncolors=$(command -v tput > /dev/null && tput colors) # supports color
     if test -n "$ncolors" && test $ncolors -ge 8; then
         termcols=$(tput cols)
         bold="$(tput bold)"
diff --git a/rpm/setup_11.x b/rpm/setup_11.x
index 4a236049..2f8bd414 100644
--- a/rpm/setup_11.x
+++ b/rpm/setup_11.x
@@ -32,7 +32,7 @@ print_status() {
 }
 
 if test -t 1; then # if terminal
-    ncolors=$(which tput > /dev/null && tput colors) # supports color
+    ncolors=$(command -v tput > /dev/null && tput colors) # supports color
     if test -n "$ncolors" && test $ncolors -ge 8; then
         termcols=$(tput cols)
         bold="$(tput bold)"
diff --git a/rpm/setup_12.x b/rpm/setup_12.x
index 98103fc8..2ff21831 100644
--- a/rpm/setup_12.x
+++ b/rpm/setup_12.x
@@ -32,7 +32,7 @@ print_status() {
 }
 
 if test -t 1; then # if terminal
-    ncolors=$(which tput > /dev/null && tput colors) # supports color
+    ncolors=$(command -v tput > /dev/null && tput colors) # supports color
     if test -n "$ncolors" && test $ncolors -ge 8; then
         termcols=$(tput cols)
         bold="$(tput bold)"
diff --git a/rpm/setup_13.x b/rpm/setup_13.x
index f7638fd6..ca01c0a1 100644
--- a/rpm/setup_13.x
+++ b/rpm/setup_13.x
@@ -32,7 +32,7 @@ print_status() {
 }
 
 if test -t 1; then # if terminal
-    ncolors=$(which tput > /dev/null && tput colors) # supports color
+    ncolors=$(command -v tput > /dev/null && tput colors) # supports color
     if test -n "$ncolors" && test $ncolors -ge 8; then
         termcols=$(tput cols)
         bold="$(tput bold)"
diff --git a/rpm/setup_14.x b/rpm/setup_14.x
index 3cef31f0..0bec3c4c 100644
--- a/rpm/setup_14.x
+++ b/rpm/setup_14.x
@@ -32,7 +32,7 @@ print_status() {
 }
 
 if test -t 1; then # if terminal
-    ncolors=$(which tput > /dev/null && tput colors) # supports color
+    ncolors=$(command -v tput > /dev/null && tput colors) # supports color
     if test -n "$ncolors" && test $ncolors -ge 8; then
         termcols=$(tput cols)
         bold="$(tput bold)"
diff --git a/rpm/setup_15.x b/rpm/setup_15.x
index 6ad703a5..7a7dffd5 100644
--- a/rpm/setup_15.x
+++ b/rpm/setup_15.x
@@ -32,7 +32,7 @@ print_status() {
 }
 
 if test -t 1; then # if terminal
-    ncolors=$(which tput > /dev/null && tput colors) # supports color
+    ncolors=$(command -v tput > /dev/null && tput colors) # supports color
     if test -n "$ncolors" && test $ncolors -ge 8; then
         termcols=$(tput cols)
         bold="$(tput bold)"
diff --git a/rpm/setup_4.x b/rpm/setup_4.x
index d5293f6d..2ad60066 100644
--- a/rpm/setup_4.x
+++ b/rpm/setup_4.x
@@ -32,7 +32,7 @@ print_status() {
 }
 
 if test -t 1; then # if terminal
-    ncolors=$(which tput > /dev/null && tput colors) # supports color
+    ncolors=$(command -v tput > /dev/null && tput colors) # supports color
     if test -n "$ncolors" && test $ncolors -ge 8; then
         termcols=$(tput cols)
         bold="$(tput bold)"
diff --git a/rpm/setup_5.x b/rpm/setup_5.x
index 95ad37e9..9b410243 100644
--- a/rpm/setup_5.x
+++ b/rpm/setup_5.x
@@ -32,7 +32,7 @@ print_status() {
 }
 
 if test -t 1; then # if terminal
-    ncolors=$(which tput > /dev/null && tput colors) # supports color
+    ncolors=$(command -v tput > /dev/null && tput colors) # supports color
     if test -n "$ncolors" && test $ncolors -ge 8; then
         termcols=$(tput cols)
         bold="$(tput bold)"
diff --git a/rpm/setup_6.x b/rpm/setup_6.x
index 4dac1951..446674df 100644
--- a/rpm/setup_6.x
+++ b/rpm/setup_6.x
@@ -32,7 +32,7 @@ print_status() {
 }
 
 if test -t 1; then # if terminal
-    ncolors=$(which tput > /dev/null && tput colors) # supports color
+    ncolors=$(command -v tput > /dev/null && tput colors) # supports color
     if test -n "$ncolors" && test $ncolors -ge 8; then
         termcols=$(tput cols)
         bold="$(tput bold)"
diff --git a/rpm/setup_7.x b/rpm/setup_7.x
index 62aaa37f..623487e6 100644
--- a/rpm/setup_7.x
+++ b/rpm/setup_7.x
@@ -32,7 +32,7 @@ print_status() {
 }
 
 if test -t 1; then # if terminal
-    ncolors=$(which tput > /dev/null && tput colors) # supports color
+    ncolors=$(command -v tput > /dev/null && tput colors) # supports color
     if test -n "$ncolors" && test $ncolors -ge 8; then
         termcols=$(tput cols)
         bold="$(tput bold)"
diff --git a/rpm/setup_8.x b/rpm/setup_8.x
index a5ab1450..e64e1cdd 100644
--- a/rpm/setup_8.x
+++ b/rpm/setup_8.x
@@ -32,7 +32,7 @@ print_status() {
 }
 
 if test -t 1; then # if terminal
-    ncolors=$(which tput > /dev/null && tput colors) # supports color
+    ncolors=$(command -v tput > /dev/null && tput colors) # supports color
     if test -n "$ncolors" && test $ncolors -ge 8; then
         termcols=$(tput cols)
         bold="$(tput bold)"
diff --git a/rpm/setup_9.x b/rpm/setup_9.x
index 84ebec21..eb6f3532 100644
--- a/rpm/setup_9.x
+++ b/rpm/setup_9.x
@@ -32,7 +32,7 @@ print_status() {
 }
 
 if test -t 1; then # if terminal
-    ncolors=$(which tput > /dev/null && tput colors) # supports color
+    ncolors=$(command -v tput > /dev/null && tput colors) # supports color
     if test -n "$ncolors" && test $ncolors -ge 8; then
         termcols=$(tput cols)
         bold="$(tput bold)"
diff --git a/rpm/setup_current.x b/rpm/setup_current.x
index 46fea02f..14bcdc50 100644
--- a/rpm/setup_current.x
+++ b/rpm/setup_current.x
@@ -32,7 +32,7 @@ print_status() {
 }
 
 if test -t 1; then # if terminal
-    ncolors=$(which tput > /dev/null && tput colors) # supports color
+    ncolors=$(command -v tput > /dev/null && tput colors) # supports color
     if test -n "$ncolors" && test $ncolors -ge 8; then
         termcols=$(tput cols)
         bold="$(tput bold)"
diff --git a/rpm/setup_iojs_1.x b/rpm/setup_iojs_1.x
index 44de2958..4d7a3b58 100644
--- a/rpm/setup_iojs_1.x
+++ b/rpm/setup_iojs_1.x
@@ -32,7 +32,7 @@ print_status() {
 }
 
 if test -t 1; then # if terminal
-    ncolors=$(which tput > /dev/null && tput colors) # supports color
+    ncolors=$(command -v tput > /dev/null && tput colors) # supports color
     if test -n "$ncolors" && test $ncolors -ge 8; then
         termcols=$(tput cols)
         bold="$(tput bold)"
diff --git a/rpm/setup_iojs_2.x b/rpm/setup_iojs_2.x
index 963f73d4..9534f529 100644
--- a/rpm/setup_iojs_2.x
+++ b/rpm/setup_iojs_2.x
@@ -32,7 +32,7 @@ print_status() {
 }
 
 if test -t 1; then # if terminal
-    ncolors=$(which tput > /dev/null && tput colors) # supports color
+    ncolors=$(command -v tput > /dev/null && tput colors) # supports color
     if test -n "$ncolors" && test $ncolors -ge 8; then
         termcols=$(tput cols)
         bold="$(tput bold)"
diff --git a/rpm/setup_iojs_3.x b/rpm/setup_iojs_3.x
index 87e78ec5..7635a7fa 100644
--- a/rpm/setup_iojs_3.x
+++ b/rpm/setup_iojs_3.x
@@ -32,7 +32,7 @@ print_status() {
 }
 
 if test -t 1; then # if terminal
-    ncolors=$(which tput > /dev/null && tput colors) # supports color
+    ncolors=$(command -v tput > /dev/null && tput colors) # supports color
     if test -n "$ncolors" && test $ncolors -ge 8; then
         termcols=$(tput cols)
         bold="$(tput bold)"
diff --git a/rpm/setup_lts.x b/rpm/setup_lts.x
index c09b8283..787cf49b 100644
--- a/rpm/setup_lts.x
+++ b/rpm/setup_lts.x
@@ -32,7 +32,7 @@ print_status() {
 }
 
 if test -t 1; then # if terminal
-    ncolors=$(which tput > /dev/null && tput colors) # supports color
+    ncolors=$(command -v tput > /dev/null && tput colors) # supports color
     if test -n "$ncolors" && test $ncolors -ge 8; then
         termcols=$(tput cols)
         bold="$(tput bold)"
diff --git a/rpm/src/_setup.sh b/rpm/src/_setup.sh
index 775def2f..06d97459 100644
--- a/rpm/src/_setup.sh
+++ b/rpm/src/_setup.sh
@@ -32,7 +32,7 @@ print_status() {
 }
 
 if test -t 1; then # if terminal
-    ncolors=$(which tput > /dev/null && tput colors) # supports color
+    ncolors=$(command -v tput > /dev/null && tput colors) # supports color
     if test -n "$ncolors" && test $ncolors -ge 8; then
         termcols=$(tput cols)
         bold="$(tput bold)"