Changed all script/* to use /usr/bin/env ruby instead of hard-coded Ruby path. public/dispatcher.* still uses the hard-coded path for compatibility with web servers that dont have Ruby in path [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2959 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

railties/CHANGELOG

@@ -1,5 +1,7 @@
 *SVN*
 
+* Changed all script/* to use #!/usr/bin/env ruby instead of hard-coded Ruby path. public/dispatcher.* still uses the hard-coded path  for compatibility with web servers that doesn't have Ruby in path [DHH]
+
 * Force RAILS_ENV to be "test" when running tests, so that ENV["RAILS_ENV"] = "production" in config/environment.rb doesn't wreck havok [DHH] #2660
 
 * Correct versioning in :freeze_gems Rake task.  #2778 [jakob@mentalized.net, Jeremy Kemper]

railties/bin/about

@@ -1,3 +1,3 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../config/boot'
 require 'commands/about'

railties/bin/breakpointer

@@ -1,3 +1,3 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../config/boot'
 require 'commands/breakpointer'

railties/bin/console

@@ -1,3 +1,3 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../config/boot'
 require 'commands/console'

railties/bin/destroy

@@ -1,3 +1,3 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../config/boot'
 require 'commands/destroy'

railties/bin/generate

@@ -1,3 +1,3 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../config/boot'
 require 'commands/generate'

railties/bin/performance/benchmarker

@@ -1,3 +1,3 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../../config/boot'
 require 'commands/performance/benchmarker'

railties/bin/performance/profiler

@@ -1,3 +1,3 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../../config/boot'
 require 'commands/performance/profiler'

railties/bin/plugin

@@ -1,3 +1,3 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../config/boot'
 require 'commands/plugin'

railties/bin/process/reaper

@@ -1,3 +1,3 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../../config/boot'
 require 'commands/process/reaper'

railties/bin/process/spawner

@@ -1,3 +1,3 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../../config/boot'
 require 'commands/process/spawner'

railties/bin/process/spinner

@@ -1,3 +1,3 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../../config/boot'
 require 'commands/process/spinner'

railties/bin/runner

@@ -1,3 +1,3 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../config/boot'
 require 'commands/runner'

railties/bin/server

@@ -1,3 +1,3 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../config/boot'
 require 'commands/server'

railties/lib/commands/performance/benchmarker.rb

@@ -1,5 +1,3 @@
-#!/usr/local/bin/ruby
-
 if ARGV.empty?
   puts "Usage: ./script/perform benchmarker [times] 'Person.expensive_way' 'Person.another_expensive_way' ..."
   exit 1

railties/lib/commands/performance/profiler.rb

@@ -1,4 +1,3 @@
-#!/usr/local/bin/ruby
 if ARGV.empty?
   $stderr.puts "Usage: ./script/perform profiler 'Person.expensive_method(10)' [times]"
   exit(1)

railties/lib/rails_generator/generators/applications/app/app_generator.rb

@@ -16,7 +16,8 @@ class AppGenerator < Rails::Generator::Base
   end
 
   def manifest
-    script_options = { :chmod => 0755, :shebang => options[:shebang] }
+    script_options     = { :chmod => 0755 }
+    dispatcher_options = { :chmod => 0755, :shebang => options[:shebang] }
 
     record do |m|
       # Root directory and all subdirectories.
@@ -53,9 +54,9 @@ class AppGenerator < Rails::Generator::Base
       end
 
       # Dispatches
-      m.file "dispatches/dispatch.rb",   "public/dispatch.rb", script_options
-      m.file "dispatches/dispatch.rb",   "public/dispatch.cgi", script_options
-      m.file "dispatches/dispatch.fcgi", "public/dispatch.fcgi", script_options
+      m.file "dispatches/dispatch.rb",   "public/dispatch.rb", dispatcher_options
+      m.file "dispatches/dispatch.rb",   "public/dispatch.cgi", dispatcher_options
+      m.file "dispatches/dispatch.fcgi", "public/dispatch.fcgi", dispatcher_options
 
       # HTML files
       %w(404 500 index).each do |file|