From b77bbab25ed90ecccca1f5c23feb641ce1f9ef51 Mon Sep 17 00:00:00 2001
From: Andre Arko <andre@arko.net>
Date: Wed, 27 Mar 2013 20:23:13 -0700
Subject: script/rails could never be from bundler

---
 railties/lib/rails/app_rails_loader.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties')

diff --git a/railties/lib/rails/app_rails_loader.rb b/railties/lib/rails/app_rails_loader.rb
index 5697c862ae..40524a8089 100644
--- a/railties/lib/rails/app_rails_loader.rb
+++ b/railties/lib/rails/app_rails_loader.rb
@@ -20,7 +20,7 @@ module Rails
           # the application is generated in the original working directory.
           exec_app_rails unless cwd == Dir.pwd
         end
-      else
+      elsif exe.match(%r(bin/rails$))
         # this is a Bundler binstub, so we load the app ourselves
         Object.const_set(:APP_PATH, File.expand_path('config/application',  Dir.pwd))
         require File.expand_path('../boot', APP_PATH)
-- 
cgit v1.2.3