mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix GitHub Packages filenames.

Browse Source 
They don't need escaped like the Bintray ones did.

Fixes https://github.com/Homebrew/brew/issues/11090 (but note this may
require the cache entry to be cleared and the package to be
redownloaded).
This commit is contained in:
Mike McQuaid 2021-04-09 16:31:04 +01:00
parent 4633ec7bff
commit bd3f1d28e7
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/dev-cmd/bottle.rb
View File

@ -538,7 +538,7 @@ module Homebrew
"date" => Pathname(local_filename).mtime.strftime("%F"), "date" => Pathname(local_filename).mtime.strftime("%F"),
"tags" => { "tags" => {
bottle_tag.to_s => { bottle_tag.to_s => {
"filename" => filename.bintray, "filename" => filename.github_packages,
"local_filename" => local_filename, "local_filename" => local_filename,
"sha256" => sha256, "sha256" => sha256,
"formulae_brew_sh_path" => formulae_brew_sh_path, "formulae_brew_sh_path" => formulae_brew_sh_path,

3
Library/Homebrew/formula.rb
View File

@ -1905,8 +1905,7 @@ class Formula
os_cellar = os_cellar.is_a?(Symbol) ? os_cellar.inspect : os_cellar os_cellar = os_cellar.is_a?(Symbol) ? os_cellar.inspect : os_cellar
checksum = collector_os[:checksum].hexdigest checksum = collector_os[:checksum].hexdigest
filename = Bottle::Filename.create(self, os, bottle_spec.rebuild).bintray path, = bottle_spec.path_resolved_basename(name, checksum, nil)
path, = bottle_spec.path_resolved_basename(name, checksum, filename)
url = "#{bottle_spec.root_url}/#{path}" url = "#{bottle_spec.root_url}/#{path}"
hash["files"][os] = { hash["files"][os] = {

11
Library/Homebrew/software_spec.rb
View File

@ -281,6 +281,10 @@ class Bottle
ERB::Util.url_encode("#{name}-#{version}#{extname}") ERB::Util.url_encode("#{name}-#{version}#{extname}")
end end
def github_packages
"#{name}--#{version}#{extname}"
end
sig { returns(String) } sig { returns(String) }
def extname def extname
s = rebuild.positive? ? ".#{rebuild}" : "" s = rebuild.positive? ? ".#{rebuild}" : ""
@ -304,12 +308,13 @@ class Bottle
checksum, tag, cellar = spec.checksum_for(Utils::Bottles.tag) checksum, tag, cellar = spec.checksum_for(Utils::Bottles.tag)
filename = Filename.create(formula, tag, spec.rebuild).bintray filename = Filename.create(formula, tag, spec.rebuild)
path, resolved_basename = spec.path_resolved_basename(@name, checksum, filename) path, resolved_basename = spec.path_resolved_basename(@name, checksum, filename)
@resource.url("#{spec.root_url}/#{path}", select_download_strategy(spec.root_url_specs)) @resource.url("#{spec.root_url}/#{path}", select_download_strategy(spec.root_url_specs))
@resource.downloader.resolved_basename = resolved_basename if resolved_basename.present? @resource.downloader.resolved_basename = resolved_basename if resolved_basename.present?
p resolved_basename
@resource.version = formula.pkg_version @resource.version = formula.pkg_version
@resource.checksum = checksum @resource.checksum = checksum
@prefix = spec.prefix @prefix = spec.prefix
@ -449,10 +454,10 @@ class BottleSpecification
def path_resolved_basename(name, checksum, filename) def path_resolved_basename(name, checksum, filename)
if root_url.match?(GitHubPackages::URL_REGEX) if root_url.match?(GitHubPackages::URL_REGEX)
image_name = GitHubPackages.image_formula_name(name) image_name = GitHubPackages.image_formula_name(name)
["#{image_name}/blobs/sha256:#{checksum}", filename] ["#{image_name}/blobs/sha256:#{checksum}", filename&.github_packages]
else else
# TODO: this can be removed when we no longer use Bintray # TODO: this can be removed when we no longer use Bintray
filename filename&.bintray
end end
end end