summaryrefslogtreecommitdiff
path: root/plugins/rails3
diff options
context:
space:
mode:
authoryleo77 <ylep77@gmail.com>2013-08-29 13:41:42 +0800
committeryleo77 <ylep77@gmail.com>2013-08-29 13:41:42 +0800
commitfda5afaebca57250792696e29c2e111f41f6fce4 (patch)
treed52b970bcdec2eb59069081353b6b4d3af6f9893 /plugins/rails3
parent6041e4938cc559b908d83b5664166cc1fd02f31e (diff)
parent434f3bc05c5245d7a27ab0bb1ede5b78acc370a4 (diff)
downloadzsh-fda5afaebca57250792696e29c2e111f41f6fce4.tar.gz
zsh-fda5afaebca57250792696e29c2e111f41f6fce4.tar.bz2
zsh-fda5afaebca57250792696e29c2e111f41f6fce4.zip
Merge remote-tracking branch 'robbyrussell/master'
Diffstat (limited to 'plugins/rails3')
-rw-r--r--plugins/rails3/rails3.plugin.zsh6
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
index 2555fab67..b53d18d08 100644
--- a/plugins/rails3/rails3.plugin.zsh
+++ b/plugins/rails3/rails3.plugin.zsh
@@ -4,7 +4,11 @@ function _rails_command () {
if [ -e "script/server" ]; then
ruby script/$@
else
- ruby script/rails $@
+ if [ -e "bin/rails" ]; then
+ bin/rails $@
+ else
+ rails $@
+ fi
fi
}