aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/lib/commands/server.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 25ba0e9620..63b6fee2ad 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Create temporary dirs relative to RAILS_ROOT when running script/server #5014 [elliot@townx.org]
+
* Minor tweak to dispatcher to use recognize instead of recognize!, as per the new routes. [Jamis Buck]
* Make "script/plugin install" work with svn+ssh URLs. [Sam Stephenson]
diff --git a/railties/lib/commands/server.rb b/railties/lib/commands/server.rb
index 82a3e1083f..0857a5756a 100644
--- a/railties/lib/commands/server.rb
+++ b/railties/lib/commands/server.rb
@@ -26,5 +26,5 @@ else
puts "=> Booting lighttpd (use 'script/server webrick' to force WEBrick)"
end
-FileUtils.mkdir_p(%w( tmp/sessions tmp/cache tmp/sockets ))
+['sessions', 'cache', 'sockets'].each { |dir_to_make| FileUtils.mkdir_p(File.join(RAILS_ROOT, 'tmp', dir_to_make)) }
require "commands/servers/#{server}"