adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/install.sh
View File

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

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