diff options
| author | Peter Tillemans <pti@snamellit.com> | 2012-08-13 14:07:58 +0200 |
|---|---|---|
| committer | Peter Tillemans <pti@snamellit.com> | 2012-08-13 14:07:58 +0200 |
| commit | 370dbe4fc7caedea615f9543cdf27e70b1c93f2a (patch) | |
| tree | 3417db876f0bfcee95f984cb4b805419f8692b27 | |
| parent | 6756be7e5b0d41c3c4f047d8d9b9e2af9bb3cb0a (diff) | |
| parent | 1a6d11dbae97d5d85129a550ec4aaba070d247e0 (diff) | |
| download | zsh-370dbe4fc7caedea615f9543cdf27e70b1c93f2a.tar.gz zsh-370dbe4fc7caedea615f9543cdf27e70b1c93f2a.tar.bz2 zsh-370dbe4fc7caedea615f9543cdf27e70b1c93f2a.zip | |
Merge branch 'master' of github.com:ptillemans/oh-my-zsh
| -rw-r--r-- | plugins/bundler/bundler.plugin.zsh | 2 | ||||
| -rw-r--r-- | tools/check_for_upgrade.sh | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh index 1ca48089e..39b76ecdf 100644 --- a/plugins/bundler/bundler.plugin.zsh +++ b/plugins/bundler/bundler.plugin.zsh @@ -6,7 +6,7 @@ alias bu="bundle update" # The following is based on https://github.com/gma/bundler-exec -bundled_commands=(annotate cap capify cucumber foreman guard middleman nanoc rackup rainbows rails rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails) +bundled_commands=(annotate cap capify cucumber foreman guard middleman nanoc rackup rainbows rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails) ## Functions diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh index bbd705a1e..612901cbe 100644 --- a/tools/check_for_upgrade.sh +++ b/tools/check_for_upgrade.sh @@ -32,9 +32,10 @@ then echo "[Oh My Zsh] Would you like to check for updates?" echo "Type Y to update oh-my-zsh: \c" read line - if [ "$line" = Y ] || [ "$line" = y ] - then + if [ "$line" = Y ] || [ "$line" = y ]; then _upgrade_zsh + else + _update_zsh_update fi fi fi |