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

Merge pull request #17537 from Homebrew/formulary-trim-version

Browse Source
This commit is contained in:
Mike McQuaid 2024-06-20 14:16:56 +01:00 committed by GitHub
commit 14d452fcde
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/dev-cmd/extract.rb
View File

@ -122,15 +122,20 @@ module Homebrew
# e.g. Foo version 1.2.3 becomes FooAT123 and resides in Foo@1.2.3.rb. # e.g. Foo version 1.2.3 becomes FooAT123 and resides in Foo@1.2.3.rb.
class_name = Formulary.class_s(name) class_name = Formulary.class_s(name)
# Remove any existing version suffixes, as a new one will be added later # The version can only contain digits with decimals in between.
version_string = version.to_s
.sub(/\D*(.+?)\D*$/, "\\1")
.gsub(/\D+/, ".")
# Remove any existing version suffixes, as a new one will be added later.
name.sub!(/\b@(.*)\z\b/i, "") name.sub!(/\b@(.*)\z\b/i, "")
versioned_name = Formulary.class_s("#{name}@#{version}") versioned_name = Formulary.class_s("#{name}@#{version_string}")
result.sub!("class #{class_name} < Formula", "class #{versioned_name} < Formula") result.sub!("class #{class_name} < Formula", "class #{versioned_name} < Formula")
# Remove bottle blocks, they won't work. # Remove bottle blocks, as they won't work.
result.sub!(BOTTLE_BLOCK_REGEX, "") result.sub!(BOTTLE_BLOCK_REGEX, "")
path = destination_tap.path/"Formula/#{name}@#{version.to_s.downcase}.rb" path = destination_tap.path/"Formula/#{name}@#{version_string}.rb"
if path.exist? if path.exist?
unless args.force? unless args.force?
odie <<~EOS odie <<~EOS