summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtools/install.sh5
-rw-r--r--tools/upgrade.sh3
2 files changed, 3 insertions, 5 deletions
diff --git a/tools/install.sh b/tools/install.sh
index dd9c4f842..e65905025 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -1,9 +1,8 @@
function main() {
# Use colors, but only if connected to a terminal, and that terminal
# supports them.
-tput=$(which tput)
-if [ -n "$tput" ]; then
- ncolors=$($tput colors)
+if which tput >/dev/null 2>&1; then
+ ncolors=$(tput colors)
fi
if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
RED="$(tput setaf 1)"
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 6e9696202..fe8fbadca 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,8 +1,7 @@
# Use colors, but only if connected to a terminal, and that terminal
# supports them.
-tput=$(which tput)
-if [ -n "$tput" ]; then
+if which tput >/dev/null 2>&1; then
ncolors=$(tput colors)
fi
if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then