From 7e73599206004659351b6071c6cdcff8efa082ec Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Wed, 18 Oct 2023 18:17:28 -0400 Subject: [PATCH] fix(rubygems) closes #3691 sed is safer than patch --- projects/rubygems.org/fit-n-finish.patch | 9 --------- projects/rubygems.org/package.yml | 4 ++++ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/projects/rubygems.org/fit-n-finish.patch b/projects/rubygems.org/fit-n-finish.patch index 8f951873..7cc82f46 100644 --- a/projects/rubygems.org/fit-n-finish.patch +++ b/projects/rubygems.org/fit-n-finish.patch @@ -173,12 +173,3 @@ index 8fef455..3ef4e30 100644 @plugins_dir = Gem.plugindir(gem_home) check_that_user_bin_dir_is_in_path end -@@ -955,7 +955,7 @@ def write_cache_file - - def ensure_writable_dir(dir) # :nodoc: - begin -- Dir.mkdir dir, *[options[:dir_mode] && 0755].compact -+ FileUtils.mkdir_p dir, *[options[:dir_mode] && 0755].compact - rescue SystemCallError - raise unless File.directory? dir - end diff --git a/projects/rubygems.org/package.yml b/projects/rubygems.org/package.yml index f1aab29d..e31bc59b 100644 --- a/projects/rubygems.org/package.yml +++ b/projects/rubygems.org/package.yml @@ -30,6 +30,10 @@ build: patch -p1 < "$SRCROOT"/props/fit-n-finish.patch patch -p1 < "$SRCROOT"/props/fit-n-finish.2.patch working-directory: ${{prefix}} + - run: | + sed -i.bak -e 's/Dir\.mkdir dir, \*\[options\[:dir_mode\].*/FileUtils.mkdir_p dir, *[options[:dir_mode] \&\& 0o755].compact/' installer.rb + rm installer.rb.bak + working-directory: ${{prefix}}/lib/rubygems # these are provided by ruby-lang.org # we don’t know why they turn up here too…