|
Lines 1-21
Link Here
|
| 1 |
commit b110d12e9c3bd2d153886681ff42c53c59ecd12d |
1 |
--- lib/rubygems/commands/setup_command.rb.orig 2021-12-08 12:47:09 UTC |
| 2 |
Author: Thibault Jouan <tj@a13.fr> |
|
|
| 3 |
AuthorDate: Mon Oct 11 23:54:27 2021 +0000 |
| 4 |
Commit: Thibault Jouan <tj@a13.fr> |
| 5 |
CommitDate: Wed Oct 13 11:49:25 2021 +0000 |
| 6 |
|
| 7 |
Prevent bundler installation |
| 8 |
|
| 9 |
Since RubyGems 3.1 the `setup' command also installs bundler and the |
| 10 |
`USE_BUNDLER_FOR_GEMDEPS' environment variable has been removed. |
| 11 |
|
| 12 |
We have to manually patch this command to remove bundler installation. |
| 13 |
|
| 14 |
diff --git lib/rubygems/commands/setup_command.rb lib/rubygems/commands/setup_command.rb |
| 15 |
index 2f7f29575..8fef1c539 100644 |
| 16 |
--- lib/rubygems/commands/setup_command.rb |
| 17 |
+++ lib/rubygems/commands/setup_command.rb |
2 |
+++ lib/rubygems/commands/setup_command.rb |
| 18 |
@@ -180,8 +180,6 @@ def execute |
3 |
@@ -180,8 +180,6 @@ By default, this RubyGems will install gem as: |
| 19 |
# Can be removed one we drop support for bundler 2.2.3 (the last version installing man files to man_dir) |
4 |
# Can be removed one we drop support for bundler 2.2.3 (the last version installing man files to man_dir) |
| 20 |
remove_old_man_files man_dir if man_dir && File.exist?(man_dir) |
5 |
remove_old_man_files man_dir if man_dir && File.exist?(man_dir) |
| 21 |
|
6 |
|
|
Lines 24-30
index 2f7f29575..8fef1c539 100644
Link Here
|
| 24 |
if mode = options[:dir_mode] |
9 |
if mode = options[:dir_mode] |
| 25 |
@mkdirs.uniq! |
10 |
@mkdirs.uniq! |
| 26 |
File.chmod(mode, @mkdirs) |
11 |
File.chmod(mode, @mkdirs) |
| 27 |
@@ -311,7 +309,6 @@ def shebang |
12 |
@@ -317,7 +315,6 @@ By default, this RubyGems will install gem as: |
| 28 |
|
13 |
|
| 29 |
def install_lib(lib_dir) |
14 |
def install_lib(lib_dir) |
| 30 |
libs = { 'RubyGems' => 'lib' } |
15 |
libs = { 'RubyGems' => 'lib' } |
|
Lines 32-38
index 2f7f29575..8fef1c539 100644
Link Here
|
| 32 |
libs.each do |tool, path| |
17 |
libs.each do |tool, path| |
| 33 |
say "Installing #{tool}" if @verbose |
18 |
say "Installing #{tool}" if @verbose |
| 34 |
|
19 |
|
| 35 |
@@ -520,7 +517,6 @@ def remove_old_bin_files(bin_dir) |
20 |
@@ -527,7 +524,6 @@ abort "#{deprecation_message}" |
| 36 |
|
21 |
|
| 37 |
def remove_old_lib_files(lib_dir) |
22 |
def remove_old_lib_files(lib_dir) |
| 38 |
lib_dirs = { File.join(lib_dir, 'rubygems') => 'lib/rubygems' } |
23 |
lib_dirs = { File.join(lib_dir, 'rubygems') => 'lib/rubygems' } |