Skip to content

GitLab

Commit 3b2d0363 authored by Robby Russell's avatar Robby Russell
Browse files

Merge pull request #4377 from fcrozat/master 

Do not fail if tput is not available
parents ccc86dae 95296bb0
Show whitespace changes
Inline Side-by-side
tools/install.sh
View file @ 3b2d0363
...@@ -2,7 +2,10 @@ set -e ...@@ -2,7 +2,10 @@ set -e
# Use colors, but only if connected to a terminal, and that terminal # Use colors, but only if connected to a terminal, and that terminal
# supports them. # 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 if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
RED="$(tput setaf 1)" RED="$(tput setaf 1)"
GREEN="$(tput setaf 2)" GREEN="$(tput setaf 2)"
......
tools/upgrade.sh
View file @ 3b2d0363
# Use colors, but only if connected to a terminal, and that terminal # Use colors, but only if connected to a terminal, and that terminal
# supports them. # 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 if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
RED="$(tput setaf 1)" RED="$(tput setaf 1)"
GREEN="$(tput setaf 2)" GREEN="$(tput setaf 2)"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment