summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorfred-o <fredrik.appelberg@gmail.com>2012-02-20 09:41:45 +0100
committerfred-o <fredrik.appelberg@gmail.com>2012-02-20 09:41:45 +0100
commit7e5dda7f434b847e4a8899beb736a7251da3d390 (patch)
tree45eccafa617e7e3ec4e7e97ff7569b157786dd6c /tools
parentf5041025844a2509f42e0bb19cb8d5418340e10c (diff)
parent362927003bcd8052e294dcbdf14f061ef4f2e173 (diff)
downloadzsh-7e5dda7f434b847e4a8899beb736a7251da3d390.tar.gz
zsh-7e5dda7f434b847e4a8899beb736a7251da3d390.tar.bz2
zsh-7e5dda7f434b847e4a8899beb736a7251da3d390.zip
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'tools')
-rw-r--r--tools/upgrade.sh27
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