repair syntax
This commit is contained in:
parent
0f544be8ff
commit
b61ae59421
@ -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
|
||||
|
||||
@ -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?
|
||||
|
||||
|
||||
@ -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}:"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user