Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed that the -r/--ruby path option of the rails command was not bei…

…ng respected (closes #4549) [ryan.raaum@gmail.com]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4177 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 0f0d926def0fd2e5ce806e5a413d12c007dd3b47 1 parent dcee137
@dhh dhh authored
View
2  railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed that the -r/--ruby path option of the rails command was not being respected #4549 [ryan.raaum@gmail.com]
+
* Added that Dispatcher exceptions should not be shown to the user unless a default log has not been configured. Instead show public/500.html [DHH]
* Fixed that rake clone_structure_to_test should quit on pgsql if the dump is unsuccesful #4585 [augustz@augustz.com]
View
7 railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -17,7 +17,8 @@ def initialize(runtime_args, runtime_options = {})
end
def manifest
- script_options = { :chmod => 0755 }
+ # Use /usr/bin/env if no special shebang was specified
+ script_options = { :chmod => 0755, :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang] }
dispatcher_options = { :chmod => 0755, :shebang => options[:shebang] }
record do |m|
@@ -93,8 +94,8 @@ def banner
def add_options!(opt)
opt.separator ''
opt.separator 'Options:'
- opt.on("-r", "--ruby", String,
- "Path to the Ruby binary of your choice.",
+ opt.on("-r", "--ruby=path", String,
+ "Path to the Ruby binary of your choice (otherwise scripts use env, dispatchers current path).",
"Default: #{DEFAULT_SHEBANG}") { |options[:shebang]| }
opt.on("-d", "--database=name", String,
Please sign in to comment.
Something went wrong with that request. Please try again.