diff options
| author | Robby Russell <robby@planetargon.com> | 2012-01-16 12:53:52 -0800 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2012-01-16 12:53:52 -0800 |
| commit | dc45119ecc2d0d244ecc463cc959473a99423cb6 (patch) | |
| tree | aec7838f04ebe5ad3de43ee916a413de4c880f25 /tools | |
| parent | 7a41498b0d4f68c537d494b5f849913361315fde (diff) | |
| parent | 0d99759cc371d7b8f70cde950f42cc3558559533 (diff) | |
| download | zsh-dc45119ecc2d0d244ecc463cc959473a99423cb6.tar.gz zsh-dc45119ecc2d0d244ecc463cc959473a99423cb6.tar.bz2 zsh-dc45119ecc2d0d244ecc463cc959473a99423cb6.zip | |
Merge pull request #833 from backspace/patch-1
Don’t report that Oh My Zsh has been updated when it hasn’t.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/upgrade.sh | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/tools/upgrade.sh b/tools/upgrade.sh index 6ffe56f4c..b2a1c06c4 100644 --- a/tools/upgrade.sh +++ b/tools/upgrade.sh @@ -1,12 +1,19 @@ current_path=`pwd` printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh" -( cd $ZSH && git pull origin master ) -printf '\033[0;32m%s\033[0m\n' ' __ __ ' -printf '\033[0;32m%s\033[0m\n' ' ____ / /_ ____ ___ __ __ ____ _____/ /_ ' -printf '\033[0;32m%s\033[0m\n' ' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ ' -printf '\033[0;32m%s\033[0m\n' '/ /_/ / / / / / / / / / / /_/ / / /_(__ ) / / / ' -printf '\033[0;32m%s\033[0m\n' '\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ ' -printf '\033[0;32m%s\033[0m\n' ' /____/ ' -printf '\033[0;34m%s\033[0m\n' 'Hooray! Oh My Zsh has been updated and/or is at the current version.' -printf '\033[0;34m%s\033[1m%s\033[0m\n' 'To keep up on the latest, be sure to follow Oh My Zsh on twitter: ' 'http://twitter.com/ohmyzsh' -cd "$current_path" +cd $ZSH + +if git pull origin master +then + printf '\033[0;32m%s\033[0m\n' ' __ __ ' + printf '\033[0;32m%s\033[0m\n' ' ____ / /_ ____ ___ __ __ ____ _____/ /_ ' + printf '\033[0;32m%s\033[0m\n' ' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ ' + printf '\033[0;32m%s\033[0m\n' '/ /_/ / / / / / / / / / / /_/ / / /_(__ ) / / / ' + printf '\033[0;32m%s\033[0m\n' '\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ ' + printf '\033[0;32m%s\033[0m\n' ' /____/ ' + printf '\033[0;34m%s\033[0m\n' 'Hooray! Oh My Zsh has been updated and/or is at the current version.' + printf '\033[0;34m%s\033[1m%s\033[0m\n' 'To keep up on the latest, be sure to follow Oh My Zsh on twitter: ' 'http://twitter.com/ohmyzsh' +else + printf '\033[0;31m%s\033[0m\n' 'There was an error updating. Try again later?' +fi + +cd "$current_path"
\ No newline at end of file |