formula_installer: optlink even with cask installed

This commit is contained in:
Michael Cho 2025-09-12 12:24:14 -04:00
parent eda9e78529
commit c35fe04c91
No known key found for this signature in database
GPG Key ID: 55E85E28A7CD1E85

View File

@ -1156,17 +1156,6 @@ on_request: installed_on_request?, options:)
def link(keg) def link(keg)
Formula.clear_cache Formula.clear_cache
unless link_keg
begin
keg.optlink(verbose: verbose?, overwrite: overwrite?)
rescue Keg::LinkError => e
ofail "Failed to create #{formula.opt_prefix}"
puts "Things that depend on #{formula.full_name} will probably not build."
puts e
end
return
end
cask_installed_with_formula_name = begin cask_installed_with_formula_name = begin
Cask::CaskLoader.load(formula.name, warn: false).installed? Cask::CaskLoader.load(formula.name, warn: false).installed?
rescue Cask::CaskUnavailableError, Cask::CaskInvalidError rescue Cask::CaskUnavailableError, Cask::CaskInvalidError
@ -1175,6 +1164,17 @@ on_request: installed_on_request?, options:)
if cask_installed_with_formula_name if cask_installed_with_formula_name
ohai "#{formula.name} cask is installed, skipping link." ohai "#{formula.name} cask is installed, skipping link."
@link_keg = false
end
unless link_keg
begin
keg.optlink(verbose: verbose?, overwrite: overwrite?)
rescue Keg::LinkError => e
ofail "Failed to create #{formula.opt_prefix}"
puts "Things that depend on #{formula.full_name} will probably not build."
puts e
end
return return
end end