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

repair how to show casks to be installed

Browse Source
This commit is contained in:
hyuraku 2022-08-17 22:14:05 +09:00
parent 634fcad1b2
commit 8a7f445d1f
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,14 +70,33 @@ module Cask
quarantine: quarantine, quarantine: quarantine,
quiet: quiet, quiet: quiet,
zap: zap, zap: zap,
dry_run: dry_run,
}.compact }.compact
options[:quarantine] = true if options[:quarantine].nil? options[:quarantine] = true if options[:quarantine].nil?
if dry_run
casks_to_install = casks.reject(&:installed?)
if casks_to_install.present?
ohai "Would install #{casks_to_install.count} #{"package".pluralize(casks_to_install.count)}:"
puts casks_to_install.map(&:full_name).join(" ")
end
end
require "cask/installer" require "cask/installer"
casks.each do |cask| casks.each do |cask|
if dry_run
dep_names = CaskDependent.new(cask)
.runtime_dependencies
.reject(&:installed?)
.map(&:to_formula)
.map(&:name)
if dep_names.present?
ohai "Would install #{dep_names.count} #{"dependency".pluralize(dep_names.count)} for #{cask.full_name}:"
puts dep_names.join(" ")
end
next
end
Installer.new(cask, **options).install Installer.new(cask, **options).install
rescue CaskAlreadyInstalledError => e rescue CaskAlreadyInstalledError => e
opoo e.message opoo e.message

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

@ -24,7 +24,7 @@ module Cask
skip_cask_deps: false, binaries: true, verbose: false, skip_cask_deps: false, binaries: true, verbose: false,
zap: false, require_sha: false, upgrade: false, zap: false, require_sha: false, upgrade: false,
installed_as_dependency: false, quarantine: true, installed_as_dependency: false, quarantine: true,
verify_download_integrity: true, quiet: false, dry_run: false) verify_download_integrity: true, quiet: false)
@cask = cask @cask = cask
@command = command @command = command
@force = force @force = force
@ -39,12 +39,11 @@ module Cask
@quarantine = quarantine @quarantine = quarantine
@verify_download_integrity = verify_download_integrity @verify_download_integrity = verify_download_integrity
@quiet = quiet @quiet = quiet
@dry_run = dry_run
end end
attr_predicate :binaries?, :force?, :skip_cask_deps?, :require_sha?, attr_predicate :binaries?, :force?, :skip_cask_deps?, :require_sha?,
:reinstall?, :upgrade?, :verbose?, :zap?, :installed_as_dependency?, :reinstall?, :upgrade?, :verbose?, :zap?, :installed_as_dependency?,
:quarantine?, :quiet?, :dry_run? :quarantine?, :quiet?
def self.caveats(cask) def self.caveats(cask)
odebug "Printing caveats" odebug "Printing caveats"
@ -97,13 +96,9 @@ module Cask
check_conflicts check_conflicts
print caveats print caveats
if dry_run?
puts "#{Formatter.identifier(@cask)} would be installed"
exit
end
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?
oh1 "Installing Cask #{Formatter.identifier(@cask)}" oh1 "Installing Cask #{Formatter.identifier(@cask)}"