summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Cornellà <marc.cornella@live.com>2020-03-11 14:24:04 +0100
committerMarc Cornellà <marc.cornella@live.com>2020-03-11 14:28:37 +0100
commit27f4e079329dabf8e7008b98c8bddf443116eb54 (patch)
tree7f5155795ecfac60b3a085ddeffbe74eb0436d33
parent6ba2d9de3d85408e6d9ebc32a00a4df2194693e1 (diff)
downloadzsh-27f4e079329dabf8e7008b98c8bddf443116eb54.tar.gz
zsh-27f4e079329dabf8e7008b98c8bddf443116eb54.tar.bz2
zsh-27f4e079329dabf8e7008b98c8bddf443116eb54.zip
updater: use hardcoded color sequences instead of tput
-rw-r--r--tools/upgrade.sh25
1 files changed, 11 insertions, 14 deletions
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 6d0a46637..10f816080 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,23 +1,20 @@
# Use colors, but only if connected to a terminal, and that terminal
# supports them.
-if which tput >/dev/null 2>&1; then
- ncolors=$(tput colors)
-fi
-if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
- RED="$(tput setaf 1)"
- GREEN="$(tput setaf 2)"
- YELLOW="$(tput setaf 3)"
- BLUE="$(tput setaf 4)"
- BOLD="$(tput bold)"
- NORMAL="$(tput sgr0)"
+if [ -t 1 ]; then
+ RED=$(printf '\033[31m')
+ GREEN=$(printf '\033[32m')
+ YELLOW=$(printf '\033[33m')
+ BLUE=$(printf '\033[34m')
+ BOLD=$(printf '\033[1m')
+ RESET=$(printf '\033[m')
else
RED=""
GREEN=""
YELLOW=""
BLUE=""
BOLD=""
- NORMAL=""
+ RESET=""
fi
cd "$ZSH"
@@ -51,10 +48,10 @@ then
printf '%s\n' '\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ '
printf '%s\n' ' /____/ '
printf "${BLUE}%s\n" "Hooray! Oh My Zsh has been updated and/or is at the current version."
- printf "${BLUE}${BOLD}%s${NORMAL}\n" "To keep up on the latest news and updates, follow us on twitter: https://twitter.com/ohmyzsh"
- printf "${BLUE}${BOLD}%s${NORMAL}\n" "Get your Oh My Zsh swag at: https://shop.planetargon.com/collections/oh-my-zsh"
+ printf "${BLUE}${BOLD}%s${RESET}\n" "To keep up on the latest news and updates, follow us on twitter: https://twitter.com/ohmyzsh"
+ printf "${BLUE}${BOLD}%s${RESET}\n" "Get your Oh My Zsh swag at: https://shop.planetargon.com/collections/oh-my-zsh"
else
- printf "${RED}%s${NORMAL}\n" 'There was an error updating. Try again later?'
+ printf "${RED}%s${RESET}\n" 'There was an error updating. Try again later?'
fi
# Unset git-config values set just for the upgrade