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

1 files changed, 5 insertions, 4 deletions

diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
index aee2cced24..2713854b61 100644
--- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb
+++ b/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|