diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2020-03-08 02:18:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-08 10:18:53 +0900 |
| commit | 2b6ec768fc227650db6ad9eb9af7c4aaea06d986 (patch) | |
| tree | 4c2cb8641727dc8a6587f5ad44db19f6d0e73d03 /tool/rbinstall.rb | |
| parent | 47a1872cd8b901b8aab6dedce7fa3807c97d290d (diff) | |
Fix rbinstall bugs (#2930)
* Fix incorrect calls to `Gem.ensure_gem_subdirectories`
This method doesn't take keyword args.
* Remove stuff no longer necessary
Now `Gem.ensure_gem_subdirectories` is doing its job, so some stuff is
no longer needed.
* Use the proper method for default gems
* Respect DESTDIR when creating rubygems folder layout
* Use `Gem.default_specifications_dir`
Notes
Notes:
Merged-By: hsbt <hsbt@ruby-lang.org>
Diffstat (limited to 'tool/rbinstall.rb')
| -rwxr-xr-x | tool/rbinstall.rb | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index b1914d795b..ce7a8ea5e6 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -819,12 +819,11 @@ end def install_default_gem(dir, srcdir) gem_dir = Gem.default_dir - directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) - prepare "default gems from #{dir}", gem_dir, directories + install_dir = with_destdir(gem_dir) + Gem.ensure_default_gem_subdirectories(install_dir, $dir_mode) + prepare "default gems from #{dir}", gem_dir - spec_dir = File.join(gem_dir, directories.grep(/^spec/)[0]) - default_spec_dir = "#{spec_dir}/default" - makedirs(default_spec_dir) + default_spec_dir = Gem.default_specifications_dir gems = Dir.glob("#{srcdir}/#{dir}/**/*.gemspec").map {|src| spec = load_gemspec(src) @@ -866,9 +865,9 @@ end install?(:ext, :comm, :gem, :'bundled-gems') do gem_dir = Gem.default_dir - directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) - prepare "bundled gems", gem_dir, directories install_dir = with_destdir(gem_dir) + Gem.ensure_gem_subdirectories(install_dir, $dir_mode) + prepare "bundled gems", gem_dir installed_gems = {} options = { :install_dir => install_dir, |