Skip to content

Commit b6f9932

Browse files
chadDavid Heinemeier Hansson
authored andcommitted
fix bad logic in determining if in rails app subdir
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
1 parent d283ca3 commit b6f9932

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

railties/lib/rails/script_rails_loader.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ module ScriptRailsLoader
77

88
def self.exec_script_rails!
99
cwd = Dir.pwd
10+
return unless in_rails_application? || in_rails_application_subdirectory?
1011
exec RUBY, SCRIPT_RAILS, *ARGV if in_rails_application?
1112
Dir.chdir("..") do
1213
# Recurse in a chdir block: if the search fails we want to be sure
@@ -18,7 +19,7 @@ def self.exec_script_rails!
1819
end
1920

2021
def self.in_rails_application?
21-
File.exists?(SCRIPT_RAILS) || in_rails_application_subdirectory?
22+
File.exists?(SCRIPT_RAILS)
2223
end
2324

2425
def self.in_rails_application_subdirectory?(path = Pathname.new(Dir.pwd))

0 commit comments

Comments
 (0)