diff options
Diffstat (limited to 'railties/lib/rails/cli.rb')
| -rw-r--r-- | railties/lib/rails/cli.rb | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/railties/lib/rails/cli.rb b/railties/lib/rails/cli.rb index d49431919d..443d6f47ad 100644 --- a/railties/lib/rails/cli.rb +++ b/railties/lib/rails/cli.rb @@ -1,12 +1,16 @@ require 'rbconfig' require 'rails/script_rails_loader' +# If we are inside a Rails application this method performs an exec and thus +# the rest of this script is not run. Rails::ScriptRailsLoader.exec_script_rails! -railties_path = File.expand_path('../../lib', __FILE__) -$:.unshift(railties_path) if File.directory?(railties_path) && !$:.include?(railties_path) - require 'rails/ruby_version_check' -Signal.trap("INT") { puts; exit } +Signal.trap("INT") { puts; exit(1) } -require 'rails/commands/application' +if ARGV.first == 'plugin' + ARGV.shift + require 'rails/commands/plugin_new' +else + require 'rails/commands/application' +end |