From 7ee5843c3cedfe36a680d5b28aa31eef45296c50 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Wed, 16 Dec 2009 11:56:51 -0600
Subject: Fully expand relative rails framework paths and make sure we aren't
 adding any to the load path more than once.

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

(limited to 'railties/bin')

diff --git a/railties/bin/rails b/railties/bin/rails
index 808df97429..0f51d5739f 100755
--- a/railties/bin/rails
+++ b/railties/bin/rails
@@ -4,9 +4,10 @@ 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
+  $:.unshift File.expand_path('../../lib', __FILE__)
+  $:.unshift File.expand_path('../../../activesupport/lib', __FILE__)
+  $:.unshift File.expand_path('../../../actionpack/lib', __FILE__)
+  require 'rails/ruby_version_check'
 end
 
 Signal.trap("INT") { puts; exit }
-- 
cgit v1.2.3


From 1cd949006a419807d5ae3400442942b752780ca2 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sun, 27 Dec 2009 14:43:06 -0800
Subject: Fix the i18n dependency problem

---
 railties/bin/rails | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/bin')

diff --git a/railties/bin/rails b/railties/bin/rails
index 0f51d5739f..b8b2d6188f 100755
--- a/railties/bin/rails
+++ b/railties/bin/rails
@@ -20,7 +20,7 @@ end
 
 ARGV << "--help" if ARGV.empty?
 
-require 'rails'
+
 require 'rails/generators'
 require 'rails/generators/rails/app/app_generator'
 
-- 
cgit v1.2.3