From 04974c400fa3031387970819916f495c95fe1d95 Mon Sep 17 00:00:00 2001 From: Cormac Relf Date: Wed, 23 Nov 2011 18:00:01 +1100 Subject: [PATCH] ok --- tools/check_for_upgrade.sh | 5 ++--- tools/upgrade.sh | 21 ++++++++++++--------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh index 0803af710..d2b7b9260 100644 --- a/tools/check_for_upgrade.sh +++ b/tools/check_for_upgrade.sh @@ -10,8 +10,8 @@ function _update_zsh_update() { if [ -f ~/.zsh-update ] then - . ~/.zsh-update - + . ~/.zsh-update + if [[ -z "$LAST_EPOCH" ]]; then _update_zsh_update && return 0; fi @@ -27,7 +27,6 @@ then /usr/bin/env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh # update the zsh file _update_zsh_update - cat ~/.zshrc > $ZSH/templates/zshrc-backup fi fi else diff --git a/tools/upgrade.sh b/tools/upgrade.sh index 52a8cc4da..3d2a0b766 100644 --- a/tools/upgrade.sh +++ b/tools/upgrade.sh @@ -1,12 +1,15 @@ +# backup zshrc +cat ~/.zshrc > ~/.oh-my-zsh/templates/zshrc-backup + current_path=`pwd` -echo -e "\033[0;34mUpgrading Oh My Zsh\033[0m" +echo "\033[0;34mUpgrading Oh My Zsh\033[0m" ( cd $ZSH && git pull origin master ) -echo -e "\033[0;32m"' __ __ '"\033[0m" -echo -e "\033[0;32m"' ____ / /_ ____ ___ __ __ ____ _____/ /_ '"\033[0m" -echo -e "\033[0;32m"' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ '"\033[0m" -echo -e "\033[0;32m"'/ /_/ / / / / / / / / / / /_/ / / /_(__ ) / / / '"\033[0m" -echo -e "\033[0;32m"'\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ '"\033[0m" -echo -e "\033[0;32m"' /____/ '"\033[0m" -echo -e "\033[0;34mHooray! Oh My Zsh has been updated and/or is at the current version.\033[0m" -echo -e "\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 "\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" cd "$current_path"