diff options
| author | Robby Russell <robby@planetargon.com> | 2015-09-26 09:29:34 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2015-09-26 09:29:34 -0700 |
| commit | 3b2d03630f557769c659e150eceabe54c89b545a (patch) | |
| tree | 6b34c54e4d18a2dbb52d19925c6cc050b3ed5ec8 | |
| parent | ccc86dae7669006d2c114aa5711871ad0eb8fe93 (diff) | |
| parent | 95296bb0c5fade33c6cda7ccc7139a35c2641b3a (diff) | |
| download | zsh-3b2d03630f557769c659e150eceabe54c89b545a.tar.gz zsh-3b2d03630f557769c659e150eceabe54c89b545a.tar.bz2 zsh-3b2d03630f557769c659e150eceabe54c89b545a.zip | |
Merge pull request #4377 from fcrozat/master
Do not fail if tput is not available
| -rwxr-xr-x | tools/install.sh | 5 | ||||
| -rw-r--r-- | tools/upgrade.sh | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/tools/install.sh b/tools/install.sh index 4b1a6ba7e..30d66d4b5 100755 --- 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)" diff --git a/tools/upgrade.sh b/tools/upgrade.sh index 65af6e368..6e9696202 100644 --- 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)" |