From b61ae5942166e9ffcd49b0595fddcb726cd36f75 Mon Sep 17 00:00:00 2001 From: hyuraku <32809703+hyuraku@users.noreply.github.com> Date: Fri, 19 Aug 2022 21:43:57 +0900 Subject: [PATCH] repair syntax --- Library/Homebrew/cask/cmd/install.rb | 24 ++++++++++++------------ Library/Homebrew/cask/installer.rb | 2 +- Library/Homebrew/install.rb | 14 +++++++------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Library/Homebrew/cask/cmd/install.rb b/Library/Homebrew/cask/cmd/install.rb index 82333efb68..fb410b83d5 100644 --- a/Library/Homebrew/cask/cmd/install.rb +++ b/Library/Homebrew/cask/cmd/install.rb @@ -81,24 +81,24 @@ module Cask ohai "Would install #{casks_to_install.count} #{plural}:" puts casks_to_install.map(&:full_name).join(" ") end - end - - require "cask/installer" - - casks.each do |cask| - if dry_run + casks.each do |cask| dep_names = CaskDependent.new(cask) .runtime_dependencies .reject(&:installed?) .map(&:to_formula) .map(&:name) - if dep_names.present? - plural = "dependency".pluralize(dep_names.count) - ohai "Would install #{dep_names.count} #{plural} for #{cask.full_name}:" - puts dep_names.join(" ") - end - next + next if dep_names.blank? + + plural = "dependency".pluralize(dep_names.count) + ohai "Would install #{dep_names.count} #{plural} for #{cask.full_name}:" + puts dep_names.join(" ") end + return + end + + require "cask/installer" + + casks.each do |cask| Installer.new(cask, **options).install rescue CaskAlreadyInstalledError => e opoo e.message diff --git a/Library/Homebrew/cask/installer.rb b/Library/Homebrew/cask/installer.rb index 18337bd043..9ef2b3bea2 100644 --- a/Library/Homebrew/cask/installer.rb +++ b/Library/Homebrew/cask/installer.rb @@ -96,8 +96,8 @@ module Cask check_conflicts print caveats - fetch + uninstall_existing_cask if reinstall? backup if force? && @cask.staged_path.exist? && @cask.metadata_versioned_path.exist? diff --git a/Library/Homebrew/install.rb b/Library/Homebrew/install.rb index 953b7545b0..9a4cddc3b9 100644 --- a/Library/Homebrew/install.rb +++ b/Library/Homebrew/install.rb @@ -301,7 +301,6 @@ module Homebrew debug: debug, quiet: quiet, verbose: verbose, - dry_run: dry_run, ) begin @@ -325,7 +324,13 @@ module Homebrew plural = "package".pluralize(formulae_name_to_install.count) ohai "Would install #{formulae_name_to_install.count} #{plural}:" puts formulae_name_to_install.join(" ") + + formula_installers.each do |fi| + f = fi.formula + print_dry_run_dependencies(f, fi.compute_dependencies) + end end + return end formula_installers.each do |fi| @@ -337,11 +342,6 @@ module Homebrew def install_formula(formula_installer) f = formula_installer.formula - if formula_installer.dry_run? - print_dry_run_dependencies(f, formula_installer.compute_dependencies) - return - end - upgrade = f.linked? && f.outdated? && !f.head? && !Homebrew::EnvConfig.no_install_upgrade? Upgrade.install_formula(formula_installer, upgrade: upgrade) @@ -349,7 +349,7 @@ module Homebrew private_class_method :install_formula def print_dry_run_dependencies(formula, dependencies) - return if dependencies.empry? + return if dependencies.empty? plural = "dependency".pluralize(dependencies.count) ohai "Would install #{dependencies.count} #{plural} for #{formula.name}:"