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

Escape prefix when interpolating into regexp

Browse Source
This commit is contained in:
Jack Nagel 2013-12-27 13:01:41 -06:00
parent b50d5126ee
commit ccc0eb98ba
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/ENV/4.3/cc
View File

@ -137,7 +137,7 @@ class Cmd
when /^-L(.+)?/ when /^-L(.+)?/
path = $1.chuzzle || whittler.next path = $1.chuzzle || whittler.next
doit = case path.cleanpath doit = case path.cleanpath
when %r{^#{brewfix}} when %r{^#{Regexp.escape(brewfix)}}
# maybe homebrew is installed to /sw or /opt/brew # maybe homebrew is installed to /sw or /opt/brew
true true
when %r{^/opt}, %r{^/sw}, %r{/usr/X11} when %r{^/opt}, %r{^/sw}, %r{/usr/X11}
@ -201,7 +201,7 @@ class Cmd
end end
def cpath def cpath
cpath = ENV['CMAKE_PREFIX_PATH'].split(':').map{|d| "#{d}/include" } + ENV['CMAKE_INCLUDE_PATH'].split(':') cpath = ENV['CMAKE_PREFIX_PATH'].split(':').map{|d| "#{d}/include" } + ENV['CMAKE_INCLUDE_PATH'].split(':')
opt = cpath.grep(%r{^#{brewfix}/opt}) opt = cpath.grep(%r{^#{Regexp.escape(brewfix)}/opt})
sys = cpath - opt sys = cpath - opt
[sys, opt] [sys, opt]
end end