make suggestions round 2
This commit is contained in:
parent
afd7bb8889
commit
8b4197dd10
@ -13,10 +13,10 @@ module Homebrew
|
|||||||
usage_banner <<~EOS
|
usage_banner <<~EOS
|
||||||
`autoremove` [<options>]
|
`autoremove` [<options>]
|
||||||
|
|
||||||
Remove packages that weren't installed on request and are no longer needed.
|
Uninstall formulae that were only installed as a dependency of another formula and are now no longer needed.
|
||||||
EOS
|
EOS
|
||||||
switch "-n", "--dry-run",
|
switch "-n", "--dry-run",
|
||||||
description: "Just print what would be removed."
|
description: "List what would be uninstalled, but do not actually uninstall anything."
|
||||||
named 0
|
named 0
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -26,7 +26,7 @@ module Homebrew
|
|||||||
Tab.for_keg(f.any_installed_keg).installed_on_request
|
Tab.for_keg(f.any_installed_keg).installed_on_request
|
||||||
end
|
end
|
||||||
|
|
||||||
removable_formulae += get_removable_formulae(formulae - removable_formulae) if removable_formulae.any?
|
removable_formulae += get_removable_formulae(formulae - removable_formulae) if removable_formulae.present?
|
||||||
|
|
||||||
removable_formulae
|
removable_formulae
|
||||||
end
|
end
|
||||||
@ -35,18 +35,15 @@ module Homebrew
|
|||||||
args = autoremove_args.parse
|
args = autoremove_args.parse
|
||||||
|
|
||||||
removable_formulae = get_removable_formulae(Formula.installed)
|
removable_formulae = get_removable_formulae(Formula.installed)
|
||||||
|
|
||||||
return if removable_formulae.blank?
|
return if removable_formulae.blank?
|
||||||
|
|
||||||
formulae_names = removable_formulae.map(&:full_name).sort
|
formulae_names = removable_formulae.map(&:full_name).sort
|
||||||
|
|
||||||
intent = args.dry_run? ? "could" : "will"
|
verb = args.dry_run? ? "Would uninstall" : "Uninstalling"
|
||||||
oh1 "Formulae that #{intent} be removed"
|
oh1 "#{verb} #{formulae_names.count} unneeded #{"formula".pluralize(formulae_names.count)}:"
|
||||||
puts formulae_names
|
puts formulae_names.join("\n")
|
||||||
|
|
||||||
return if args.dry_run?
|
return if args.dry_run?
|
||||||
|
|
||||||
puts
|
|
||||||
kegs_by_rack = removable_formulae.map(&:any_installed_keg).group_by(&:rack)
|
kegs_by_rack = removable_formulae.map(&:any_installed_keg).group_by(&:rack)
|
||||||
Uninstall.uninstall_kegs(kegs_by_rack)
|
Uninstall.uninstall_kegs(kegs_by_rack)
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user