updated files

This commit is contained in:
Preston Davis 2015-10-31 06:33:50 -04:00
commit 89946f0bc0
16 changed files with 2672 additions and 2 deletions

View file

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