mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-25 09:41:20 +08:00
installer: don't rely on tput for coloring
tput is error-prone and may not be needed, since all the formatting codes used are standard across all types of terminals.
This commit is contained in:
parent
d69bad8eb4
commit
702a594df3
|
@ -50,25 +50,22 @@ error() {
|
||||||
echo ${RED}"Error: $@"${RESET} >&2
|
echo ${RED}"Error: $@"${RESET} >&2
|
||||||
}
|
}
|
||||||
|
|
||||||
# Set up color sequences
|
|
||||||
setup_color() {
|
setup_color() {
|
||||||
ncolors=$(tput colors 2>/dev/null) || ncolors=0
|
# Only use colors if connected to a terminal
|
||||||
|
if [ -t 1 ]; then
|
||||||
# Only use colors if connected to a terminal that supports them
|
|
||||||
if [ -t 1 ] && [ $ncolors -ge 8 ]; then
|
|
||||||
RED="$(tput setaf 1)"
|
|
||||||
GREEN="$(tput setaf 2)"
|
|
||||||
YELLOW="$(tput setaf 3)"
|
|
||||||
BLUE="$(tput setaf 4)"
|
|
||||||
BOLD="$(tput bold)"
|
|
||||||
RESET="$(tput sgr0)"
|
|
||||||
else
|
|
||||||
RED=$(printf '\033[31m')
|
RED=$(printf '\033[31m')
|
||||||
GREEN=$(printf '\033[32m')
|
GREEN=$(printf '\033[32m')
|
||||||
YELLOW=$(printf '\033[33m')
|
YELLOW=$(printf '\033[33m')
|
||||||
BLUE=$(printf '\033[34m')
|
BLUE=$(printf '\033[34m')
|
||||||
BOLD=$(printf '\033[1m')
|
BOLD=$(printf '\033[1m')
|
||||||
RESET=$(printf '\033[m')
|
RESET=$(printf '\033[m')
|
||||||
|
else
|
||||||
|
RED=""
|
||||||
|
GREEN=""
|
||||||
|
YELLOW=""
|
||||||
|
BLUE=""
|
||||||
|
BOLD=""
|
||||||
|
RESET=""
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user