admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #6942 from MikeMcQuaid/cleanup-catalina-fixes

Browse Source 
cleanup: fix portable ruby bundler removal.
This commit is contained in:
Mike McQuaid 2020-01-16 17:03:13 +00:00 committed by GitHub
commit febc84af06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Library/Homebrew/cleanup.rb
View File

@ -347,26 +347,26 @@ module Homebrew
portable_ruby_path = vendor_path/"portable-ruby" portable_ruby_path = vendor_path/"portable-ruby"
portable_ruby_glob = "#{portable_ruby_path}/*.*" portable_ruby_glob = "#{portable_ruby_path}/*.*"
portable_rubies_to_remove = []
Pathname.glob(portable_ruby_glob).each do |path| Pathname.glob(portable_ruby_glob).each do |path|
next if !use_system_ruby && portable_ruby_version == path.basename.to_s next if !use_system_ruby && portable_ruby_version == path.basename.to_s
if dry_run? portable_rubies_to_remove << path
puts "Would remove: #{path} (#{path.abv})" puts "Would remove: #{path} (#{path.abv})" if dry_run?
else
FileUtils.rm_rf path
end
end end
return unless Dir.glob(portable_ruby_glob).empty? return if portable_rubies_to_remove.empty?
return unless portable_ruby_path.exist?
bundler_path = vendor_path/"bundle/ruby" bundler_path = vendor_path/"bundle/ruby"
if dry_run? if dry_run?
puts "Would remove: #{bundler_path} (#{bundler_path.abv})" puts Utils.popen_read("git", "-C", HOMEBREW_REPOSITORY, "clean", "-nx", bundler_path).chomp
puts "Would remove: #{portable_ruby_path} (#{portable_ruby_path.abv})"
else else
FileUtils.rm_rf [bundler_path, portable_ruby_path] puts Utils.popen_read("git", "-C", HOMEBREW_REPOSITORY, "clean", "-ffqx", bundler_path).chomp
end end
return if dry_run?
FileUtils.rm_rf portable_rubies_to_remove
end end
def cleanup_old_cache_db def cleanup_old_cache_db