From 8693ca4e4dba7b9db492979f04507f0f93a639a1 Mon Sep 17 00:00:00 2001 From: Seeker Date: Thu, 21 Jan 2021 22:52:26 -0800 Subject: [PATCH] software_spec: change BottleSpecification#checksums to return array --- Library/Homebrew/dev-cmd/bottle.rb | 6 ++---- Library/Homebrew/software_spec.rb | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/dev-cmd/bottle.rb b/Library/Homebrew/dev-cmd/bottle.rb index 2d790c02c6..654bea0052 100644 --- a/Library/Homebrew/dev-cmd/bottle.rb +++ b/Library/Homebrew/dev-cmd/bottle.rb @@ -30,11 +30,9 @@ BOTTLE_ERB = <<-EOS <% if rebuild.positive? %> rebuild <%= rebuild %> <% end %> - <% checksums.each do |checksum_type, checksum_values| %> - <% checksum_values.each do |checksum_value| %> + <% checksums.each do |checksum_value| %> <% checksum, macos = checksum_value.shift %> - <%= checksum_type %> "<%= checksum %>" => :<%= macos %> - <% end %> + sha256 "<%= checksum %>" => :<%= macos %> <% end %> end EOS diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb index bbaa116def..b618ee6679 100644 --- a/Library/Homebrew/software_spec.rb +++ b/Library/Homebrew/software_spec.rb @@ -439,13 +439,12 @@ class BottleSpecification # Sort non-MacOS tags below MacOS tags. "0.#{tag}" end - sha256s = tags.reverse.map do |tag| + tags.reverse.map do |tag| { collector[tag][:checksum] => tag, cellar: collector[tag][:cellar], } end - { sha256: sha256s } end end