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

Merge pull request #5613 from MikeMcQuaid/cask-link-formula-name

Browse Source 
formula_installer: skip linking formulae with already installed casks.
This commit is contained in:
Mike McQuaid 2019-01-26 08:43:22 +00:00 committed by GitHub
commit 0670282908
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/formula_installer.rb
View File

@ -793,6 +793,17 @@ class FormulaInstaller
return return
end end
cask_installed_with_formula_name = begin
Cask::CaskLoader.load(formula.name).installed?
rescue Cask::CaskUnavailableError
false
end
if cask_installed_with_formula_name
ohai "#{formula.name} cask is installed, skipping link."
return
end
if keg.linked? if keg.linked?
opoo "This keg was marked linked already, continuing anyway" opoo "This keg was marked linked already, continuing anyway"
keg.remove_linked_keg_record keg.remove_linked_keg_record