Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cleanup: fix portable ruby bundler removal. #6942

Merged
merged 2 commits into from Jan 16, 2020
Merged

cleanup: fix portable ruby bundler removal. #6942

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d27c5fb
Catalina upgrades causes Homebrew to break when you run brew cleanup.…
Jan 15, 2020
f59c596
cleanup: fix portable ruby bundler removal logic.
MikeMcQuaid Jan 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions Library/Homebrew/cleanup.rb
View file
Open in desktop
Expand Up @@ -347,26 +347,26 @@ def cleanup_portable_ruby

portable_ruby_path = vendor_path/"portable-ruby"
portable_ruby_glob = "#{portable_ruby_path}/*.*"
portable_rubies_to_remove = []
Pathname.glob(portable_ruby_glob).each do |path|
next if !use_system_ruby && portable_ruby_version == path.basename.to_s

if dry_run?
puts "Would remove: #{path} (#{path.abv})"
else
FileUtils.rm_rf path
end
portable_rubies_to_remove << path
puts "Would remove: #{path} (#{path.abv})" if dry_run?
end

return unless Dir.glob(portable_ruby_glob).empty?
return unless portable_ruby_path.exist?
return if portable_rubies_to_remove.empty?

bundler_path = vendor_path/"bundle/ruby"
if dry_run?
puts "Would remove: #{bundler_path} (#{bundler_path.abv})"
puts "Would remove: #{portable_ruby_path} (#{portable_ruby_path.abv})"
puts Utils.popen_read("git", "-C", HOMEBREW_REPOSITORY, "clean", "-nx", bundler_path).chomp
else
FileUtils.rm_rf [bundler_path, portable_ruby_path]
puts Utils.popen_read("git", "-C", HOMEBREW_REPOSITORY, "clean", "-ffqx", bundler_path).chomp
end

return if dry_run?

FileUtils.rm_rf portable_rubies_to_remove
end

def cleanup_old_cache_db
Expand Down