Merged tracks-mu-import branch changes r113:130 into the trunk

git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@131 a4c988fc-2ded-0310-b66e-134b36920a42

tracks/script/server

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/ruby1.8
 
 require 'webrick'
 require 'optparse'
@@ -22,10 +22,7 @@ ARGV.options do |opts|
           "Default: 3000") { |OPTIONS[:port]| }
   opts.on("-b", "--binding=ip", String,
           "Binds Rails to the specified ip.",
-          "Default: 127.0.0.1") { |OPTIONS[:ip]| }
-  opts.on("-i", "--index=controller", String,
-          "Specifies an index controller that requests for root will go to (instead of congratulations screen)."
-          ) { |OPTIONS[:index_controller]| }
+          "Default: 0.0.0.0") { |OPTIONS[:ip]| }
   opts.on("-e", "--environment=name", String,
           "Specifies the environment to run this server under (test/development/production).",
           "Default: development") { |OPTIONS[:environment]| }
@@ -48,4 +45,5 @@ require 'webrick_server'
 OPTIONS['working_directory'] = File.expand_path(RAILS_ROOT)
 
 puts "=> Rails application started on http://#{OPTIONS[:ip]}:#{OPTIONS[:port]}"
+puts "=> Ctrl-C to shutdown server; call with --help for options" if OPTIONS[:server_type] == WEBrick::SimpleServer
 DispatchServlet.dispatch(OPTIONS)