Skip to content
Browse files

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

  • Loading branch information...
2 parents b0d80e1 + d05b201 commit 52c81cdadcc61fac3c56b76d0a241e97dd7ee7b6 @wangbus wangbus committed Aug 13, 2012
Showing with 4 additions and 3 deletions.
  1. +1 −1 plugins/bundler/bundler.plugin.zsh
  2. +3 −2 tools/check_for_upgrade.sh
View
2 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
View
5 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

0 comments on commit 52c81cd

Please sign in to comment.
Something went wrong with that request. Please try again.