From f0dd77c6be6a86fe384bb0015151e0a497973d39 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Thu, 24 Sep 2009 14:01:31 -0700
Subject: Move railties/lib/* into railties/lib/*

---
 railties/bin/rails | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'railties/bin')

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
-- 
cgit v1.2.3