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

Merge pull request #13716 from carlocab/cleanup-cleanup_path

Browse Source 
cleanup: use `cleanup_path` more consistently
This commit is contained in:
Carlo Cabrera 2022-08-19 23:02:38 +08:00 committed by GitHub
commit 6096bc6d71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/cleanup.rb
View File

@ -428,7 +428,6 @@ module Homebrew
next if !use_system_ruby && portable_ruby_latest_version == path.basename.to_s next if !use_system_ruby && portable_ruby_latest_version == path.basename.to_s
portable_rubies_to_remove << path portable_rubies_to_remove << path
puts "Would remove: #{path} (#{path.abv})" if dry_run?
end end
return if portable_rubies_to_remove.empty? return if portable_rubies_to_remove.empty?
@ -440,20 +439,16 @@ module Homebrew
puts Utils.popen_read("git", "-C", HOMEBREW_REPOSITORY, "clean", "-ffqx", bundler_path).chomp puts Utils.popen_read("git", "-C", HOMEBREW_REPOSITORY, "clean", "-ffqx", bundler_path).chomp
end end
return if dry_run? portable_rubies_to_remove.each do |portable_ruby|
cleanup_path(portable_ruby) { portable_ruby.rmtree }
FileUtils.rm_rf portable_rubies_to_remove end
end end
def cleanup_bootsnap def cleanup_bootsnap
bootsnap = cache/"bootsnap" bootsnap = cache/"bootsnap"
return unless bootsnap.exist? return unless bootsnap.exist?
if dry_run? cleanup_path(bootsnap) { bootsnap.rmtree }
puts "Would remove: #{bootsnap} (#{bootsnap.abv})"
else
FileUtils.rm_rf bootsnap
end
end end
def cleanup_cache_db(rack = nil) def cleanup_cache_db(rack = nil)