370dbe4fc7caedea615f9543cdf27e70b1c93f2a

Author
Peter Tillemans <pti@snamellit.com>
Committer
Peter Tillemans <pti@snamellit.com>
Date

Message

Merge branch 'master' of github.com:ptillemans/oh-my-zsh

Diff

 1diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
 2index 1ca48089e17848c3fadaa76b23566b801bd19e24..39b76ecdf9d8af6221430461b99c545bae2a804f 100644
 3--- a/plugins/bundler/bundler.plugin.zsh
 4+++ b/plugins/bundler/bundler.plugin.zsh
 5@@ -6,7 +6,7 @@ alias bu="bundle update"
 6 
 7 # The following is based on https://github.com/gma/bundler-exec
 8 
 9-bundled_commands=(annotate cap capify cucumber foreman guard middleman nanoc rackup rainbows rails rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails)
10+bundled_commands=(annotate cap capify cucumber foreman guard middleman nanoc rackup rainbows rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails)
11 
12 ## Functions
13 
14diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
15index bbd705a1e8de80152e3577f1e3bd854b58e2185d..612901cbe5e122b8a3ac0ebe3b5e72b4c3948b58 100644
16--- a/tools/check_for_upgrade.sh
17+++ b/tools/check_for_upgrade.sh
18@@ -32,9 +32,10 @@ then
19       echo "[Oh My Zsh] Would you like to check for updates?"
20       echo "Type Y to update oh-my-zsh: \c"
21       read line
22-      if [ "$line" = Y ] || [ "$line" = y ]
23-      then
24+      if [ "$line" = Y ] || [ "$line" = y ]; then
25         _upgrade_zsh
26+      else
27+        _update_zsh_update
28       fi
29     fi
30   fi