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

Use Downloadable API in FromBottleLoader.

Browse Source
This commit is contained in:
Markus Reiter 2024-07-13 11:36:03 -04:00
parent 0a7b61a0a9
commit 643fa83a28
No known key found for this signature in database
GPG Key ID: 245293B51702655B
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Library/Homebrew/formulary.rb
View File

@ -592,21 +592,21 @@ module Formulary
def self.try_new(ref, from: T.unsafe(nil), warn: false) def self.try_new(ref, from: T.unsafe(nil), warn: false)
ref = ref.to_s ref = ref.to_s
new(ref) if HOMEBREW_BOTTLES_EXTNAME_REGEX.match?(ref) new(ref, warn:) if HOMEBREW_BOTTLES_EXTNAME_REGEX.match?(ref)
end end
def initialize(bottle_name) def initialize(bottle_name, warn: false)
case bottle_name case bottle_name
when URL_START_REGEX when URL_START_REGEX
# The name of the formula is found between the last slash and the last hyphen. # The name of the formula is found between the last slash and the last hyphen.
formula_name = File.basename(bottle_name)[/(.+)-/, 1] formula_name = File.basename(bottle_name)[/(.+)-/, 1]
resource = Resource.new(formula_name) { url bottle_name } resource = Resource.new(formula_name) { url bottle_name, bottle: true }
resource.specs[:bottle] = true if resource.downloaded?
downloader = resource.downloader ohai "Pouring the cached bottle" unless warn
cached = downloader.cached_location.exist? else
downloader.fetch resource.fetch
ohai "Pouring the cached bottle" if cached end
@bottle_filename = downloader.cached_location @bottle_filename = resource.cached_download
else else
@bottle_filename = Pathname(bottle_name).realpath @bottle_filename = Pathname(bottle_name).realpath
end end