Customization/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-28 16:50:07 +00:00
Code Releases Activity

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

Browse source 
@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
This commit is contained in:
Yannick Eckey 2015-10-15 15:37:30 +02:00
parent 306e3e7ea0
commit 75e619b724
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tools/install.sh
View file

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

3
tools/upgrade.sh
View file

@ -1,8 +1,7 @@
# 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