From f94fee5a7fd1a4704d65d52a2f1c522a3831ca1a Mon Sep 17 00:00:00 2001 From: Andrew Janke Date: Mon, 28 Sep 2015 08:35:25 -0400 Subject: [PATCH] installer: don't bail on errors in color setup This is a hack to keep the installer working on systems without tput/terminfo. --- tools/install.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/install.sh b/tools/install.sh index 5633320a..67d341c7 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -1,5 +1,3 @@ -set -e - # Use colors, but only if connected to a terminal, and that terminal # supports them. tput=$(which tput) @@ -21,6 +19,11 @@ else BOLD="" NORMAL="" 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) if [ ! $CHECK_ZSH_INSTALLED -ge 1 ]; then printf "${YELLOW}Zsh is not installed!${NORMAL} Please install zsh first!\n"