From 11fa70dd0903a75f2a507dd609ea640e8ec99373 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 12 Sep 2011 09:05:11 -0700
Subject: Just provide the executable for railtie. This should be fine since
 Rubygems now warns before overriding them.

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

(limited to 'railties/bin')

diff --git a/railties/bin/rails b/railties/bin/rails
index a7d6938e0d..a1c4faaa73 100755
--- a/railties/bin/rails
+++ b/railties/bin/rails
@@ -1,2 +1,7 @@
 #!/usr/bin/env ruby
-require "rails/cli"
\ No newline at end of file
+
+if File.exists?(File.join(File.expand_path('../../..', __FILE__), '.git'))
+  railties_path = File.expand_path('../../lib', __FILE__)
+  $:.unshift(railties_path)
+end
+require "rails/cli"
-- 
cgit v1.2.3