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

github_packages: fix HOMEBREW_BOTTLE_DOMAIN usage.

Browse Source 
This still worked but ended up always having a `/bottles-*/` part of the
URL that was unnecessary when using `HOMEBREW_BOTTLE_DOMAIN`.
This commit is contained in:
Mike McQuaid 2021-03-16 15:17:42 +00:00
parent 234fae6bd6
commit 7fc52d2065
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/github_packages.rb
View File

@ -13,7 +13,8 @@ class GitHubPackages
include Context include Context
include Utils::Curl include Utils::Curl
URL_REGEX = %r{https://ghcr.io/v2/([\w-]+)/([\w-]+)}.freeze URL_PREFIX = "https://ghcr.io/v2/"
URL_REGEX = %r{#{Regexp.escape(URL_PREFIX)}([\w-]+)/([\w-]+)}.freeze
sig { returns(String) } sig { returns(String) }
def inspect def inspect

6
Library/Homebrew/software_spec.rb
View File

@ -379,7 +379,11 @@ class BottleSpecification
def root_url(var = nil, specs = {}) def root_url(var = nil, specs = {})
if var.nil? if var.nil?
@root_url ||= "#{Homebrew::EnvConfig.bottle_domain}/#{Utils::Bottles::Bintray.repository(tap)}" @root_url ||= if Homebrew::EnvConfig.bottle_domain.start_with?(GitHubPackages::URL_PREFIX)
"#{GitHubPackages::URL_PREFIX}#{tap.full_name}"
else
"#{Homebrew::EnvConfig.bottle_domain}/#{Utils::Bottles::Bintray.repository(tap)}"
end
else else
@root_url = var @root_url = var
@root_url_specs.merge!(specs) @root_url_specs.merge!(specs)