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

Merge pull request #8875 from reitermarkus/cask-install-taps

Browse Source 
Fix installing taps in `brew install`.
This commit is contained in:
Mike McQuaid 2020-10-07 14:22:11 +01:00 committed by GitHub
commit 588f5f1713
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Library/Homebrew/cmd/install.rb
View File

@ -146,15 +146,16 @@ module Homebrew
def install
args = install_args.parse
only = :formula if args.formula?
only = :cask if args.cask?
only = :formula if args.formula? && !args.cask?
only = :cask if args.cask? && !args.formula?
objects = args.named.to_objects(only: only)
args.named.each do |name|
next if File.exist?(name)
next if name !~ HOMEBREW_TAP_FORMULA_REGEX && name !~ HOMEBREW_CASK_TAP_CASK_REGEX
taps, formulae_or_casks = objects.partition { |o| o.is_a?(Tap) }
taps = (taps + formulae_or_casks.map(&:tap).compact).uniq.sort_by(&:name)
taps.reject(&:installed?).each(&:install)
tap = Tap.fetch(Regexp.last_match(1), Regexp.last_match(2))
tap.install unless tap.installed?
end
if args.ignore_dependencies?
opoo <<~EOS
@ -165,7 +166,8 @@ module Homebrew
EOS
end
formulae, casks = formulae_or_casks.partition { |formula_or_cask| formula_or_cask.is_a?(Formula) }
formulae, casks = args.named.to_formulae_and_casks(only: only)
.partition { |formula_or_cask| formula_or_cask.is_a?(Formula) }
if casks.any?
Cask::Cmd::Install.install_casks(