From 45b4594189139e40009cc3dfc583f3406f47ad46 Mon Sep 17 00:00:00 2001 From: Andrew Hodges Date: Sat, 4 Jun 2011 08:41:04 -0400 Subject: [PATCH] Colorized Tool Improvement Replace color codes with easy to understand names. Improve wording of some messages. --- tools/install.sh | 34 ++++++++++++++++++++-------------- tools/uninstall.sh | 16 +++++++++++----- tools/upgrade.sh | 24 +++++++++++++++--------- 3 files changed, 46 insertions(+), 28 deletions(-) diff --git a/tools/install.sh b/tools/install.sh index aedb706da..5b72c7395 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -1,36 +1,42 @@ +RESET="\033[0m" +RED="\033[0;31m" +BLUE="\033[0;34m" +GREEN="\033[0;32m" +YELLOW="\033[0;33m" +UNDERLN="\033[4m" if [ -d ~/.oh-my-zsh ] then - echo "\033[0;33mYou already have Oh My Zsh installed.\033[0m You'll need to remove ~/.oh-my-zsh if you want to install" + echo "${YELLOW}You already have Oh My Zsh installed.${RESET} You'll need to remove ~/.oh-my-zsh if you want to install" exit fi -echo "\033[0;34mCloning Oh My Zsh...\033[0m" +echo "${BLUE}Cloning Oh My Zsh...${RESET}" /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh -echo "\033[0;34mLooking for an existing zsh config...\033[0m" +echo "${BLUE}Looking for an existing zsh config...${RESET}" if [ -f ~/.zshrc ] || [ -h ~/.zshrc ] then - echo "\033[0;33mFound ~/.zshrc.\033[0m \033[0;32]Backing up to ~/.zshrc.pre-oh-my-zsh\033[0m"; + echo "${YELLOW}Found ~/.zshrc.${RESET} ${GREEN}Backing up to ~/.zshrc.pre-oh-my-zsh${RESET}"; cp ~/.zshrc ~/.zshrc.pre-oh-my-zsh; rm ~/.zshrc; fi -echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[0m" +echo "${BLUE}Using the Oh My Zsh template file and adding it to ~/.zshrc${RESET}" cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc -echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m" +echo "${BLUE}Copying your current PATH and adding it to the end of ~/.zshrc for you.${RESET}" echo "export PATH=$PATH" >> ~/.zshrc -echo "\033[0;34mTime to change your default shell to zsh!\033[0m" +echo "${BLUE}Time to change your default shell to zsh!${RESET}" chsh -s `which zsh` -echo "\033[0;32m"' __ __ '"\033[0m" -echo "\033[0;32m"' ____ / /_ ____ ___ __ __ ____ _____/ /_ '"\033[0m" -echo "\033[0;32m"' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ '"\033[0m" -echo "\033[0;32m"'/ /_/ / / / / / / / / / / /_/ / / /_(__ ) / / / '"\033[0m" -echo "\033[0;32m"'\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ '"\033[0m" -echo "\033[0;32m"' /____/ '"\033[0m" +echo "${GREEN}"' __ __ '"${RESET}" +echo "${GREEN}"' ____ / /_ ____ ___ __ __ ____ _____/ /_ '"${RESET}" +echo "${GREEN}"' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ '"${RESET}" +echo "${GREEN}"'/ /_/ / / / / / / / / / / /_/ / / /_(__ ) / / / '"${RESET}" +echo "${GREEN}"'\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ '"${RESET}" +echo "${GREEN}"' /____/ '"${RESET}" -echo "\n\n \033[0;32m....is now installed.\033[0m" +echo "\n\n ${GREEN}....is now installed.${RESET}" /usr/bin/env zsh source ~/.zshrc diff --git a/tools/uninstall.sh b/tools/uninstall.sh index 8ff583322..1bd0678a6 100644 --- a/tools/uninstall.sh +++ b/tools/uninstall.sh @@ -1,20 +1,26 @@ -echo "Removing ~/.oh-my-zsh" +RESET="\033[0m" +RED="\033[0;31m" +BLUE="\033[0;34m" +GREEN="\033[0;32m" +YELLOW="\033[0;33m" +UNDERLN="\033[4m" +echo "${RED}Removing ~/.oh-my-zsh${RESET}" if [[ -d ~/.oh-my-zsh ]] then rm -rf ~/.oh-my-zsh fi -echo "Looking for an existing zsh config..." +echo "${BLUE}Looking for an existing zsh config...${RESET}" if [ -f ~/.zshrc.pre-oh-my-zsh ] || [ -h ~/.zshrc.pre-oh-my-zsh ] then - echo "Found ~/.zshrc. Backing up to ~/.zshrc.pre-oh-my-zsh"; + echo "${YELLOW}Found ~/.zshrc.pre-oh-my-zsh.${RESET} ${GREEN}Restoring to ~/.zshrc${RESET}"; rm ~/.zshrc; cp ~/.zshrc.pre-oh-my-zsh ~/.zshrc; source ~/.zshrc; else - echo "Switching back to bash" + echo "${BLUE}Switching back to bash${RESET}" chsh -s /bin/bash source /etc/profile fi -echo "Thanks for trying out Oh My Zsh. It's been uninstalled." \ No newline at end of file +echo "${GREEN}Thanks for trying out Oh My Zsh. It has been uninstalled.${RESET}" diff --git a/tools/upgrade.sh b/tools/upgrade.sh index e30488822..5e67b0cd5 100644 --- a/tools/upgrade.sh +++ b/tools/upgrade.sh @@ -1,12 +1,18 @@ +RESET="\033[0m" +RED="\033[0;31m" +BLUE="\033[0;34m" +GREEN="\033[0;32m" +YELLOW="\033[0;33m" +UNDERLN="\033[4m" current_path=`pwd` -echo "\033[0;34mUpgrading Oh My Zsh\033[0m" +echo "${BLUE}Upgrading Oh My Zsh${RESET}" ( cd $ZSH && git pull origin master ) -echo "\033[0;32m"' __ __ '"\033[0m" -echo "\033[0;32m"' ____ / /_ ____ ___ __ __ ____ _____/ /_ '"\033[0m" -echo "\033[0;32m"' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ '"\033[0m" -echo "\033[0;32m"'/ /_/ / / / / / / / / / / /_/ / / /_(__ ) / / / '"\033[0m" -echo "\033[0;32m"'\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ '"\033[0m" -echo "\033[0;32m"' /____/ '"\033[0m" -echo "\033[0;34mHooray! Oh My Zsh has been updated and/or is at the current version.\033[0m" -echo "\033[0;34mTo keep up on the latest, be sure to follow Oh My Zsh on twitter: \033[1mhttp://twitter.com/ohmyzsh\033[0m" +echo "${GREEN}"' __ __ '"${RESET}" +echo "${GREEN}"' ____ / /_ ____ ___ __ __ ____ _____/ /_ '"${RESET}" +echo "${GREEN}"' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ '"${RESET}" +echo "${GREEN}"'/ /_/ / / / / / / / / / / /_/ / / /_(__ ) / / / '"${RESET}" +echo "${GREEN}"'\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ '"${RESET}" +echo "${GREEN}"' /____/ '"${RESET}" +echo "${BLUE}Hooray! Oh My Zsh has been updated and/or is at the latest version.${RESET}" +echo "${BLUE}To keep up on the latest, be sure to follow Oh My Zsh on twitter: ${UNDERLN}http://twitter.com/ohmyzsh${RESET}" cd $current_path