Skip to content

O
oh-my-zsh
Commit 75e619b7 authored by Yannick Eckey's avatar Yannick Eckey
Browse files
Options

Fix install.sh/upgrade.sh for tput-less systems

@fcrozat's original fix assumes `which` not to output anything to STDOUT in case the command is not found. That is not necessarily true on all systems. A better solution is to check the return value instead. Fixes #4376
parent 306e3e7e
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
tools/install.sh
View file @ 75e619b7
...@@ -2,9 +2,8 @@ set -e ...@@ -2,9 +2,8 @@ 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.
tput=$(which tput) if which tput >/dev/null 2>&1; then
if [ -n "$tput" ]; then ncolors=$(tput colors)
ncolors=$($tput colors)
fi 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)"
......
tools/upgrade.sh
View file @ 75e619b7
# 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.
tput=$(which tput) if which tput >/dev/null 2>&1; then
if [ -n "$tput" ]; then
ncolors=$(tput colors) ncolors=$(tput colors)
fi fi
if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
......
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