From 16e5d158c23af1c7ca2c7aa32d964db97cb9a4f7 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Sun, 3 Apr 2011 19:16:08 -0300 Subject: Add railties to the LOAD_PATH if running from a Rails checkout --- bin/rails | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'bin') diff --git a/bin/rails b/bin/rails index a628cc35ca..f9725d78d0 100755 --- a/bin/rails +++ b/bin/rails @@ -1,9 +1,7 @@ #!/usr/bin/env ruby -begin - require "rails/cli" -rescue LoadError +if File.exists?(File.join(File.expand_path('../..', __FILE__), '.git')) railties_path = File.expand_path('../../railties/lib', __FILE__) $:.unshift(railties_path) - require "rails/cli" end +require "rails/cli" -- cgit v1.2.3