Use the correct APP_PATH based on whether application.rb exists

wycats · Aug 4, 2010 · b3ef03d · b3ef03d
1 parent 652c28a
commit b3ef03d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/commands/server.rb b/commands/server.rb
@@ -1,6 +1,6 @@
 ARGV.unshift "server"
 
-APP_PATH = File.expand_path("../../../../config/environment.rb", __FILE__)
-$".push File.expand_path("../boot.rb", APP_PATH)
+root = File.expand_path("../../../../config", __FILE__)
+APP_PATH = File.exist?("#{root}/application.rb") ? "#{root}/application.rb" : "#{root}/environment.rb"
 
 require "rails/commands"