mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-19 20:30:09 +00:00
Merge pull request #4507 from WhyEee/fix-no-tput
Fix install.sh/upgrade.sh for tput-less systems
This commit is contained in:
commit
fdb0e239d4
2 changed files with 3 additions and 5 deletions
|
@ -1,9 +1,8 @@
|
||||||
function main() {
|
function main() {
|
||||||
# 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)"
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue