From b6f99325613baf0534c10677da9c82ac27b628c0 Mon Sep 17 00:00:00 2001 From: Chad Fowler Date: Mon, 26 Jul 2010 15:35:54 -0600 Subject: [PATCH] fix bad logic in determining if in rails app subdir Signed-off-by: David Heinemeier Hansson --- railties/lib/rails/script_rails_loader.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/railties/lib/rails/script_rails_loader.rb b/railties/lib/rails/script_rails_loader.rb index 8fbd3bf492af2..91672e5d81dcb 100644 --- a/railties/lib/rails/script_rails_loader.rb +++ b/railties/lib/rails/script_rails_loader.rb @@ -7,6 +7,7 @@ module ScriptRailsLoader def self.exec_script_rails! cwd = Dir.pwd + return unless in_rails_application? || in_rails_application_subdirectory? exec RUBY, SCRIPT_RAILS, *ARGV if in_rails_application? Dir.chdir("..") do # Recurse in a chdir block: if the search fails we want to be sure @@ -18,7 +19,7 @@ def self.exec_script_rails! end def self.in_rails_application? - File.exists?(SCRIPT_RAILS) || in_rails_application_subdirectory? + File.exists?(SCRIPT_RAILS) end def self.in_rails_application_subdirectory?(path = Pathname.new(Dir.pwd))