Merge pull request #4377 from fcrozat/master

Do not fail if tput is not available
11 years ago · 3b2d03630f
parent ccc86dae76 95296bb0c5
commit 3b2d03630f
2 changed files with 8 additions and 2 deletions
--- a/tools/install.sh
+++ b/tools/install.sh
@ -2,7 +2,10 @@ set -e

 # Use colors, but only if connected to a terminal, and that terminal
 # supports them.
-ncolors=$(tput colors)
+tput=$(which tput)
+if [ -n "$tput" ]; then
+    ncolors=$($tput colors)
+fi
 if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
  RED="$(tput setaf 1)"
  GREEN="$(tput setaf 2)"
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@ -1,7 +1,10 @@

 # Use colors, but only if connected to a terminal, and that terminal
 # supports them.
-ncolors=$(tput colors)
+tput=$(which tput)
+if [ -n "$tput" ]; then
+    ncolors=$(tput colors)
+fi
 if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
  RED="$(tput setaf 1)"
  GREEN="$(tput setaf 2)"