Browse code

Merge pull request #833 from backspace/patch-1

Don’t report that Oh My Zsh has been updated when it hasn’t.

Robby Russell authored on 16/01/2012 at 20:53:52
Showing 1 changed files
... ...
@@ -1,12 +1,19 @@
1 1
 current_path=`pwd`
2 2
 printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh"
3
-( cd $ZSH && git pull origin master )
4
-printf '\033[0;32m%s\033[0m\n' '         __                                     __   '
5
-printf '\033[0;32m%s\033[0m\n' '  ____  / /_     ____ ___  __  __   ____  _____/ /_  '
6
-printf '\033[0;32m%s\033[0m\n' ' / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \ '
7
-printf '\033[0;32m%s\033[0m\n' '/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '
8
-printf '\033[0;32m%s\033[0m\n' '\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '
9
-printf '\033[0;32m%s\033[0m\n' '                        /____/                       '
10
-printf '\033[0;34m%s\033[0m\n' 'Hooray! Oh My Zsh has been updated and/or is at the current version.'
11
-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'
12
-cd "$current_path"
3
+cd $ZSH
4
+
5
+if git pull origin master
6
+then
7
+  printf '\033[0;32m%s\033[0m\n' '         __                                     __   '
8
+  printf '\033[0;32m%s\033[0m\n' '  ____  / /_     ____ ___  __  __   ____  _____/ /_  '
9
+  printf '\033[0;32m%s\033[0m\n' ' / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \ '
10
+  printf '\033[0;32m%s\033[0m\n' '/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '
11
+  printf '\033[0;32m%s\033[0m\n' '\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '
12
+  printf '\033[0;32m%s\033[0m\n' '                        /____/                       '
13
+  printf '\033[0;34m%s\033[0m\n' 'Hooray! Oh My Zsh has been updated and/or is at the current version.'
14
+  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'
15
+else
16
+  printf '\033[0;31m%s\033[0m\n' 'There was an error updating. Try again later?'
17
+fi
18
+
19
+cd "$current_path"
13 20
\ No newline at end of file