Skip to content

O
oh-my-zsh
Commit 8c73eb4f authored by Marc Cornellà's avatar Marc Cornellà
Browse files
Options

Merge pull request #4419 from apjanke/installer-termcap-hack

installer: ignore errors in color setup, for FreeBSD portability
parents 45f0a280 f94fee5a
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
tools/install.sh
View file @ 8c73eb4f
set -e
# 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) tput=$(which tput)
...@@ -21,6 +19,11 @@ else ...@@ -21,6 +19,11 @@ else
BOLD="" BOLD=""
NORMAL="" NORMAL=""
fi fi
# Only enable exit-on-error after the non-critical colorization stuff,
# which may fail on systems lacking tput or terminfo
set -e
CHECK_ZSH_INSTALLED=$(grep /zsh$ /etc/shells | wc -l) CHECK_ZSH_INSTALLED=$(grep /zsh$ /etc/shells | wc -l)
if [ ! $CHECK_ZSH_INSTALLED -ge 1 ]; then if [ ! $CHECK_ZSH_INSTALLED -ge 1 ]; then
printf "${YELLOW}Zsh is not installed!${NORMAL} Please install zsh first!\n" printf "${YELLOW}Zsh is not installed!${NORMAL} Please install zsh first!\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment