Merge pull request #4507 from WhyEee/fix-no-tput

Fix install.sh/upgrade.sh for tput-less systems
This commit is contained in:
Marc Cornellà 2015-10-20 23:30:29 +02:00
commit fdb0e239d4
2 changed files with 3 additions and 5 deletions

View file

@ -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)"

View file

@ -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