diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-09-29 12:33:48 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-09-29 12:33:48 +0000 |
| commit | d219d54930a68a9c5de3705d05d5d464e5e51b54 (patch) | |
| tree | 4544f6d4dfa28de85ddf35032d9eccf1d4d49729 /railties/lib/commands/server.rb | |
| parent | 0a0ac868453e9d8d9ee1dac6a7eb274772235b05 (diff) | |
| download | rails-d219d54930a68a9c5de3705d05d5d464e5e51b54.tar.gz rails-d219d54930a68a9c5de3705d05d5d464e5e51b54.tar.bz2 rails-d219d54930a68a9c5de3705d05d5d464e5e51b54.zip | |
Clean up the act of commands
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2412 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib/commands/server.rb')
| -rw-r--r-- | railties/lib/commands/server.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/commands/server.rb b/railties/lib/commands/server.rb index 5330c050b9..d21e91f980 100644 --- a/railties/lib/commands/server.rb +++ b/railties/lib/commands/server.rb @@ -5,7 +5,7 @@ OPTIONS = { :port => 3000, :ip => "0.0.0.0", :environment => "development", - :server_root => File.expand_path(File.dirname(__FILE__) + "/../public/"), + :server_root => File.expand_path(RAILS_ROOT + "/public/"), :server_type => WEBrick::SimpleServer, :charset => "UTF-8", :mime_types => WEBrick::HTTPUtils::DefaultMimeTypes @@ -47,7 +47,7 @@ ARGV.options do |opts| end ENV["RAILS_ENV"] = OPTIONS[:environment] -require File.dirname(__FILE__) + "/../config/environment" +require RAILS_ROOT + "/config/environment" require 'webrick_server' OPTIONS['working_directory'] = File.expand_path(RAILS_ROOT) |