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

Load cask source with tap info

Browse Source 
This info is used in the installer to
decide whether to report analytics.
This commit is contained in:
apainintheneck 2023-02-27 23:51:43 -08:00
parent fdc2e9f3f5
commit b91e93cda0
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/cask/cask_loader.rb
View File

@ -46,7 +46,7 @@ module Cask
private
def cask(header_token, **options, &block)
Cask.new(header_token, source: content, **options, config: @config, &block)
Cask.new(header_token, source: content, tap: tap, **options, config: @config, &block)
end
end
@ -146,18 +146,10 @@ module Cask
super && !Tap.from_path(ref).nil?
end
attr_reader :tap
def initialize(path)
@tap = Tap.from_path(path)
super(path)
end
private
def cask(*args, &block)
super(*args, tap: tap, &block)
end
end
# Loads a cask from a specific tap.

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

@ -566,7 +566,7 @@ module Cask
def load_cask_from_source_api!
options = { git_head: @cask.tap_git_head, sha256: @cask.ruby_source_checksum["sha256"] }
cask_source = Homebrew::API::Cask.fetch_source(@cask.token, **options)
@cask = CaskLoader::FromContentLoader.new(cask_source).load(config: @cask.config)
@cask = CaskLoader::FromContentLoader.new(cask_source, tap: @cask.tap).load(config: @cask.config)
end
end
end