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

repair syntax

Browse Source
This commit is contained in:
hyuraku 2022-08-19 21:43:57 +09:00
parent 0f544be8ff
commit b61ae59421
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Library/Homebrew/cask/cmd/install.rb
View File

@ -81,24 +81,24 @@ module Cask
ohai "Would install #{casks_to_install.count} #{plural}:" ohai "Would install #{casks_to_install.count} #{plural}:"
puts casks_to_install.map(&:full_name).join(" ") puts casks_to_install.map(&:full_name).join(" ")
end end
end
require "cask/installer"
casks.each do |cask| casks.each do |cask|
if dry_run
dep_names = CaskDependent.new(cask) dep_names = CaskDependent.new(cask)
.runtime_dependencies .runtime_dependencies
.reject(&:installed?) .reject(&:installed?)
.map(&:to_formula) .map(&:to_formula)
.map(&:name) .map(&:name)
if dep_names.present? next if dep_names.blank?
plural = "dependency".pluralize(dep_names.count) plural = "dependency".pluralize(dep_names.count)
ohai "Would install #{dep_names.count} #{plural} for #{cask.full_name}:" ohai "Would install #{dep_names.count} #{plural} for #{cask.full_name}:"
puts dep_names.join(" ") puts dep_names.join(" ")
end end
next return
end end
require "cask/installer"
casks.each do |cask|
Installer.new(cask, **options).install Installer.new(cask, **options).install
rescue CaskAlreadyInstalledError => e rescue CaskAlreadyInstalledError => e
opoo e.message opoo e.message

2
Library/Homebrew/cask/installer.rb
View File

@ -96,8 +96,8 @@ module Cask
check_conflicts check_conflicts
print caveats print caveats
fetch fetch
uninstall_existing_cask if reinstall? uninstall_existing_cask if reinstall?
backup if force? && @cask.staged_path.exist? && @cask.metadata_versioned_path.exist? backup if force? && @cask.staged_path.exist? && @cask.metadata_versioned_path.exist?

14
Library/Homebrew/install.rb
View File

@ -301,7 +301,6 @@ module Homebrew
debug: debug, debug: debug,
quiet: quiet, quiet: quiet,
verbose: verbose, verbose: verbose,
dry_run: dry_run,
) )
begin begin
@ -325,8 +324,14 @@ module Homebrew
plural = "package".pluralize(formulae_name_to_install.count) plural = "package".pluralize(formulae_name_to_install.count)
ohai "Would install #{formulae_name_to_install.count} #{plural}:" ohai "Would install #{formulae_name_to_install.count} #{plural}:"
puts formulae_name_to_install.join(" ") puts formulae_name_to_install.join(" ")
formula_installers.each do |fi|
f = fi.formula
print_dry_run_dependencies(f, fi.compute_dependencies)
end end
end end
return
end
formula_installers.each do |fi| formula_installers.each do |fi|
install_formula(fi) install_formula(fi)
@ -337,11 +342,6 @@ module Homebrew
def install_formula(formula_installer) def install_formula(formula_installer)
f = formula_installer.formula 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 = f.linked? && f.outdated? && !f.head? && !Homebrew::EnvConfig.no_install_upgrade?
Upgrade.install_formula(formula_installer, upgrade: upgrade) Upgrade.install_formula(formula_installer, upgrade: upgrade)
@ -349,7 +349,7 @@ module Homebrew
private_class_method :install_formula private_class_method :install_formula
def print_dry_run_dependencies(formula, dependencies) def print_dry_run_dependencies(formula, dependencies)
return if dependencies.empry? return if dependencies.empty?
plural = "dependency".pluralize(dependencies.count) plural = "dependency".pluralize(dependencies.count)
ohai "Would install #{dependencies.count} #{plural} for #{formula.name}:" ohai "Would install #{dependencies.count} #{plural} for #{formula.name}:"