diff options
| -rw-r--r-- | Library/Homebrew/cmd/audit.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/test/test_cmd_audit.rb | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/Library/Homebrew/cmd/audit.rb b/Library/Homebrew/cmd/audit.rb index 41e160473..f2dc78299 100644 --- a/Library/Homebrew/cmd/audit.rb +++ b/Library/Homebrew/cmd/audit.rb @@ -879,11 +879,11 @@ class FormulaAuditor problem "`#{$1}` is now unnecessary" end - if line =~ %r{#\{share\}/#{formula.name}[/'"]} + if line =~ %r{#\{share\}/#{Regexp.escape(formula.name)}[/'"]} problem "Use \#{pkgshare} instead of \#{share}/#{formula.name}" end - if line =~ %r{share/"#{formula.name}[/'"]} + if line =~ %r{share/"#{Regexp.escape(formula.name)}[/'"]} problem "Use pkgshare instead of (share/\"#{formula.name}\")" end end diff --git a/Library/Homebrew/test/test_cmd_audit.rb b/Library/Homebrew/test/test_cmd_audit.rb index 0dbfbe5e6..ce37a2c8e 100644 --- a/Library/Homebrew/test/test_cmd_audit.rb +++ b/Library/Homebrew/test/test_cmd_audit.rb @@ -301,10 +301,9 @@ class FormulaAuditorTests < Homebrew::TestCase end # Regression test for https://github.com/Homebrew/homebrew/pull/48744 - # Formulae with "++" in their name would break the name check because of a - # regexp error: + # Formulae with "++" in their name would break various audit regexps: # Error: nested *?+ in regexp: /^libxml++3\s/ - def test_audit_desc_plus_plus_name + def test_audit_plus_plus_name fa = formula_auditor "foolibc++", <<-EOS.undent, :strict => true class Foolibcxx < Formula desc "foolibc++ is a test" @@ -315,5 +314,11 @@ class FormulaAuditorTests < Homebrew::TestCase fa.audit_desc assert_equal "Description shouldn't include the formula name", fa.problems.shift + + fa.audit_line 'ohai "#{share}/foolibc++"', 3 + assert_equal "Use \#{pkgshare} instead of \#{share}/foolibc++", fa.problems.shift + + fa.audit_line 'ohai share/"foolibc++"', 3 + assert_equal 'Use pkgshare instead of (share/"foolibc++")', fa.problems.shift end end |