summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Russell <robby@planetargon.com>2013-08-13 06:21:14 -0700
committerRobby Russell <robby@planetargon.com>2013-08-13 06:21:14 -0700
commitf6dbe212e8d87d78a40c309d8bd760eef63ebdfb (patch)
tree3c3b7a3f3bf1d74e9da629c10454ec8b82abab9c
parent39a5e36c379659aa11ffde9bf20b9f70c60abdbf (diff)
parent2916ef719444040528ffd1a56d91bdd1fb1b5aa5 (diff)
downloadzsh-f6dbe212e8d87d78a40c309d8bd760eef63ebdfb.tar.gz
zsh-f6dbe212e8d87d78a40c309d8bd760eef63ebdfb.tar.bz2
zsh-f6dbe212e8d87d78a40c309d8bd760eef63ebdfb.zip
Merge pull request #1672 from miry/rails3_command_fix
Use new style of rails command.
-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
}