diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-09-24 14:01:31 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-09-24 16:11:41 -0700 |
| commit | f0dd77c6be6a86fe384bb0015151e0a497973d39 (patch) | |
| tree | ad81bb4c807c39edeaa37035882a16d9d95ebaa9 /railties/bin | |
| parent | 610b81beca461a6fa4f00c7023e0e4315eb2b8be (diff) | |
| download | rails-f0dd77c6be6a86fe384bb0015151e0a497973d39.tar.gz rails-f0dd77c6be6a86fe384bb0015151e0a497973d39.tar.bz2 rails-f0dd77c6be6a86fe384bb0015151e0a497973d39.zip | |
Move railties/lib/* into railties/lib/*
Diffstat (limited to 'railties/bin')
| -rwxr-xr-x | railties/bin/rails | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/railties/bin/rails b/railties/bin/rails index 538d0cbc84..e743aa83f1 100755 --- a/railties/bin/rails +++ b/railties/bin/rails @@ -1,7 +1,17 @@ -require File.dirname(__FILE__) + '/../lib/ruby_version_check' +begin + require 'rails/ruby_version_check' +rescue LoadError + # If people are not using gems, the load path must still + # be correct. + # TODO: Remove the begin / rescue block somehow + $:.unshift File.dirname(__FILE__) + '/../lib' + $:.unshift File.dirname(__FILE__) + '/../../activesupport/lib' + retry +end + Signal.trap("INT") { puts; exit } -require File.dirname(__FILE__) + '/../lib/rails/version' +require 'rails/version' if %w(--version -v).include? ARGV.first puts "Rails #{Rails::VERSION::STRING}" exit(0) @@ -9,7 +19,7 @@ end ARGV << "--help" if ARGV.empty? -require File.dirname(__FILE__) + '/../lib/generators' -require 'generators/rails/app/app_generator' +require 'rails/generators' +require 'rails/generators/rails/app/app_generator' Rails::Generators::AppGenerator.start |