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

Merge pull request #9081 from SeekingMeaning/bottle-block

Browse Source 
bottle: fix adding bottle block to formulae with special license
This commit is contained in:
Mike McQuaid 2020-11-09 09:54:16 +00:00 committed by GitHub
commit 29160b9e7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -536,7 +536,11 @@ module Homebrew
(\n^\ {3}[\S\ ]+$)* # options can be in multiple lines (\n^\ {3}[\S\ ]+$)* # options can be in multiple lines
)?| )?|
(homepage|desc|sha256|version|mirror|license)\ ['"][\S\ ]+['"]| # specs with a string (homepage|desc|sha256|version|mirror|license)\ ['"][\S\ ]+['"]| # specs with a string
(license)\ [^\[]+?\[[^\]]+?\]| # license may contain a list license\ (
[^\[]+?\[[^\]]+?\]| # license may contain a list
[^{]+?{[^}]+?}| # license may contain a hash
:\S+ # license as a symbol
)|
(revision|version_scheme)\ \d+| # revision with a number (revision|version_scheme)\ \d+| # revision with a number
(stable|livecheck)\ do(\n+^\ {4}[\S\ ]+$)*\n+^\ {2}end # components with blocks (stable|livecheck)\ do(\n+^\ {4}[\S\ ]+$)*\n+^\ {2}end # components with blocks
)\n+ # multiple empty lines )\n+ # multiple empty lines