From 5879a2e9192dc9b6e1e17d2b6d14b26df96ff41b Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 9 Nov 2005 21:15:41 +0000 Subject: 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/lib/commands/performance/benchmarker.rb | 2 -- railties/lib/commands/performance/profiler.rb | 1 - .../rails_generator/generators/applications/app/app_generator.rb | 9 +++++---- 3 files changed, 5 insertions(+), 7 deletions(-) (limited to 'railties/lib') diff --git a/railties/lib/commands/performance/benchmarker.rb b/railties/lib/commands/performance/benchmarker.rb index b12cf57215..47b0940039 100644 --- a/railties/lib/commands/performance/benchmarker.rb +++ b/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 diff --git a/railties/lib/commands/performance/profiler.rb b/railties/lib/commands/performance/profiler.rb index f599ad6635..83e763abda 100644 --- a/railties/lib/commands/performance/profiler.rb +++ b/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) 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| -- cgit v1.2.3