From cc3352cc4148df1f83fc0ea3fd8780920420bb3a Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Sat, 9 May 2020 00:55:55 +0900
Subject: rbinstall.rb: record bundled gem files

---
 tool/rbinstall.rb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index b8526c18b5..94718866e2 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -767,6 +767,7 @@ module RbInstall
     def generate_bin_script(filename, bindir)
       return if same_bin_script?(filename, bindir)
       super
+      $installed_list.puts(File.join(without_destdir(bindir), filename)) if $installed_list
     end
 
     def same_bin_script?(filename, bindir)
@@ -777,6 +778,11 @@ module RbInstall
       end
       false
     end
+
+    def write_spec
+      super
+      $installed_list.puts(without_destdir(spec_file)) if $installed_list
+    end
   end
 end
 
@@ -824,8 +830,8 @@ end
 def install_default_gem(dir, srcdir)
   gem_dir = Gem.default_dir
   install_dir = with_destdir(gem_dir)
-  Gem.ensure_default_gem_subdirectories(install_dir, $dir_mode)
   prepare "default gems from #{dir}", gem_dir
+  makedirs(Gem.ensure_default_gem_subdirectories(install_dir, $dir_mode).map {|d| File.join(gem_dir, d)})
 
   default_spec_dir = Gem.default_specifications_dir
 
@@ -870,8 +876,8 @@ end
 install?(:ext, :comm, :gem, :'bundled-gems') do
   gem_dir = Gem.default_dir
   install_dir = with_destdir(gem_dir)
-  Gem.ensure_gem_subdirectories(install_dir, $dir_mode)
   prepare "bundled gems", gem_dir
+  makedirs(Gem.ensure_gem_subdirectories(install_dir, $dir_mode).map {|d| File.join(gem_dir, d)})
   installed_gems = {}
   options = {
     :install_dir => install_dir,
@@ -910,6 +916,7 @@ install?(:ext, :comm, :gem, :'bundled-gems') do
   end
   installed_gems, gems = Dir.glob(srcdir+'/gems/*.gem').partition {|gem| installed_gems.key?(File.basename(gem, '.gem'))}
   unless installed_gems.empty?
+    prepare "bundled gem cache", gem_dir+"/cache"
     install installed_gems, gem_dir+"/cache"
   end
   next if gems.empty?
-- 
cgit v1.2.3