From bd34df00cf7f9d4d123884095bd82f68c29279ce Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Tue, 13 Apr 2010 18:01:36 -0300
Subject: Bring back bin/rails to life on edge

---
 bin/rails | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/bin/rails b/bin/rails
index 853b1d75f9..4a74726e9b 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1 +1,7 @@
-require 'rails/cli'
+begin
+  require "rails/cli"
+rescue LoadError
+  railties_path = File.expand_path('../../railties/lib', __FILE__)
+  $:.unshift(railties_path)
+  require "rails/cli"
+end
-- 
cgit v1.2.3