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

extract: remove bottle blocks

Browse Source
This commit is contained in:
fn ⌃ ⌥ 2021-11-18 21:53:32 -08:00
parent 27a76295a4
commit 8f96ba3c1e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,6 +64,8 @@ module Homebrew
module_function module_function
BOTTLE_BLOCK_REGEX = / bottle do.+?end\n\n/m.freeze
sig { returns(CLI::Parser) } sig { returns(CLI::Parser) }
def extract_args def extract_args
Homebrew::CLI::Parser.new do Homebrew::CLI::Parser.new do
@ -184,7 +186,7 @@ module Homebrew
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, they won't work.
result.sub!(/ bottle do.+?end\n\n/m, "") if destination_tap != source_tap result.sub!(BOTTLE_BLOCK_REGEX, "")
path = destination_tap.path/"Formula/#{name}@#{version.to_s.downcase}.rb" path = destination_tap.path/"Formula/#{name}@#{version.to_s.downcase}.rb"
if path.exist? if path.exist?
@ -210,6 +212,7 @@ module Homebrew
contents = Utils::Git.last_revision_of_file(repo, file, before_commit: rev) contents = Utils::Git.last_revision_of_file(repo, file, before_commit: rev)
contents.gsub!("@url=", "url ") contents.gsub!("@url=", "url ")
contents.gsub!("require 'brewkit'", "require 'formula'") contents.gsub!("require 'brewkit'", "require 'formula'")
contents.sub!(BOTTLE_BLOCK_REGEX, "")
with_monkey_patch { Formulary.from_contents(name, file, contents, ignore_errors: true) } with_monkey_patch { Formulary.from_contents(name, file, contents, ignore_errors: true) }
end end
end end