diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-06-28 00:12:15 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-06-28 00:12:15 +0200 |
| commit | 4329f8133fee8e4f3e558787f67de59f0c4a4dd1 (patch) | |
| tree | 346ef7340d8348e50d119ca749a16c1654c20a08 /railties/lib/rails/commands | |
| parent | c37f7d66e49ffe5ac2115cc30e5529fd1c2924a8 (diff) | |
| parent | ebee77a28a7267d5f23a28ba23c1eb88a2d7d527 (diff) | |
| download | rails-4329f8133fee8e4f3e558787f67de59f0c4a4dd1.tar.gz rails-4329f8133fee8e4f3e558787f67de59f0c4a4dd1.tar.bz2 rails-4329f8133fee8e4f3e558787f67de59f0c4a4dd1.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'railties/lib/rails/commands')
| -rw-r--r-- | railties/lib/rails/commands/runner.rb | 1 | ||||
| -rw-r--r-- | railties/lib/rails/commands/server.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/runner.rb b/railties/lib/rails/commands/runner.rb index 278548558e..b97ff086b6 100644 --- a/railties/lib/rails/commands/runner.rb +++ b/railties/lib/rails/commands/runner.rb @@ -44,6 +44,7 @@ begin $stderr.puts "Run '#{$0} -h' for help." exit 1 elsif File.exist?(code_or_file) + $0 = code_or_file eval(File.read(code_or_file), nil, code_or_file) else eval(code_or_file) diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb index cb9b871875..9d9dd48ea9 100644 --- a/railties/lib/rails/commands/server.rb +++ b/railties/lib/rails/commands/server.rb @@ -9,7 +9,7 @@ module Rails args, options = args.dup, {} opt_parser = OptionParser.new do |opts| - opts.banner = "Usage: rails server [options]" + opts.banner = "Usage: rails server [mongrel, thin, etc] [options]" opts.on("-p", "--port=port", Integer, "Runs Rails on the specified port.", "Default: 3000") { |v| options[:Port] = v } opts.on("-b", "--binding=ip", String, |