linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-04-10 04:26:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Conflict merge 1

Browse source
This commit is contained in:
Preston Davis 2015-10-31 06:26:30 -04:00
commit 4d4fd1ba97
19 changed files with 1371 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tools/upgrade.sh
View file

@ -1,7 +1,12 @@
# Use colors, but only if connected to a terminal, and that terminal
# supports them.
<<<<<<< HEAD
if which tput >/dev/null 2>&1; then
=======
tput=$(which tput)
if [ -n "$tput" ]; then
>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c
ncolors=$(tput colors)
fi
if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then