mirror of
https://github.com/ruby/ruby.git
synced 2025-09-21 03:24:00 +02:00
Merge pull request #5482 from hsbt/rubygems-3-3-bundler-2-3
Merge RubyGems 3.3.x and Bundler 2.3.x
This commit is contained in:
parent
69463805f0
commit
6794f8cf92
115 changed files with 1701 additions and 889 deletions
|
@ -54,10 +54,10 @@ class Gem::Commands::SetupCommand < Gem::Command
|
|||
'List the documentation types you wish to',
|
||||
'generate. For example: rdoc,ri' do |value, options|
|
||||
options[:document] = case value
|
||||
when nil then %w[rdoc ri]
|
||||
when false then []
|
||||
else value
|
||||
end
|
||||
when nil then %w[rdoc ri]
|
||||
when false then []
|
||||
else value
|
||||
end
|
||||
end
|
||||
|
||||
add_option '--[no-]rdoc',
|
||||
|
@ -666,10 +666,10 @@ abort "#{deprecation_message}"
|
|||
|
||||
def target_bin_path(bin_dir, bin_file)
|
||||
bin_file_formatted = if options[:format_executable]
|
||||
Gem.default_exec_format % bin_file
|
||||
else
|
||||
bin_file
|
||||
end
|
||||
Gem.default_exec_format % bin_file
|
||||
else
|
||||
bin_file
|
||||
end
|
||||
File.join bin_dir, bin_file_formatted
|
||||
end
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue