From dff61c9eab54f21329e537b8d7c34a9671805db7 Mon Sep 17 00:00:00 2001 From: William Ma Date: Tue, 30 Jun 2020 12:21:21 -0400 Subject: [PATCH] style: Fix style issues --- Library/Homebrew/cli/args.rb | 8 ++++---- Library/Homebrew/cmd/reinstall.rb | 12 ++++++------ Library/Homebrew/cmd/uninstall.rb | 5 ++--- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/Library/Homebrew/cli/args.rb b/Library/Homebrew/cli/args.rb index de2d784a2b..7f76690df7 100644 --- a/Library/Homebrew/cli/args.rb +++ b/Library/Homebrew/cli/args.rb @@ -266,10 +266,10 @@ module Homebrew Keg.new(dirs.first) else f = if name.include?("/") || File.exist?(name) - Formulary.factory(name) - else - Formulary.from_rack(rack) - end + Formulary.factory(name) + else + Formulary.from_rack(rack) + end unless (prefix = f.installed_prefix).directory? raise MultipleVersionsInstalledError, rack.basename diff --git a/Library/Homebrew/cmd/reinstall.rb b/Library/Homebrew/cmd/reinstall.rb index 87fdfd577d..7d6a566af8 100644 --- a/Library/Homebrew/cmd/reinstall.rb +++ b/Library/Homebrew/cmd/reinstall.rb @@ -69,11 +69,11 @@ module Homebrew end Homebrew.messages.display_messages - unless casks.empty? - reinstall_cmd = Cask::Cmd::Reinstall.new(casks) - reinstall_cmd.verbose = args.verbose? - reinstall_cmd.force = args.force? - reinstall_cmd.run - end + return if casks.empty? + + reinstall_cmd = Cask::Cmd::Reinstall.new(casks) + reinstall_cmd.verbose = args.verbose? + reinstall_cmd.force = args.force? + reinstall_cmd.run end end diff --git a/Library/Homebrew/cmd/uninstall.rb b/Library/Homebrew/cmd/uninstall.rb index 1ee0616681..55b70fb16c 100644 --- a/Library/Homebrew/cmd/uninstall.rb +++ b/Library/Homebrew/cmd/uninstall.rb @@ -49,8 +49,8 @@ module Homebrew [rack, rack.subdirs.map { |d| Keg.new(d) }] end] else - _kegs, casks = args.kegs_casks - kegs_by_rack = _kegs.group_by(&:rack) + all_kegs, casks = args.kegs_casks + kegs_by_rack = all_kegs.group_by(&:rack) end handle_unsatisfied_dependents(kegs_by_rack) @@ -128,7 +128,6 @@ module Homebrew cask_uninstall.verbose = args.verbose? cask_uninstall.run end - rescue MultipleVersionsInstalledError => e ofail e puts "Run `brew uninstall --force #{e.name}` to remove all versions."