diff options
| author | Jack Nagel | 2013-12-27 13:01:41 -0600 |
|---|---|---|
| committer | Jack Nagel | 2013-12-27 13:01:41 -0600 |
| commit | 83ff584d7b8a6305f2fd90fa1100fac0834b52e7 (patch) | |
| tree | 4332cae91c7383586267190bc906276fe1b47343 /Library | |
| parent | 18ced70d347b19f6d90005870bedb46e648737ea (diff) | |
| download | homebrew-83ff584d7b8a6305f2fd90fa1100fac0834b52e7.tar.bz2 | |
Escape prefix when interpolating into regexp
Diffstat (limited to 'Library')
| -rwxr-xr-x | Library/ENV/4.3/cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Library/ENV/4.3/cc b/Library/ENV/4.3/cc index ba9d69285..6a9407d03 100755 --- a/Library/ENV/4.3/cc +++ b/Library/ENV/4.3/cc @@ -137,7 +137,7 @@ class Cmd when /^-L(.+)?/ path = $1.chuzzle || whittler.next doit = case path.cleanpath - when %r{^#{brewfix}} + when %r{^#{Regexp.escape(brewfix)}} # maybe homebrew is installed to /sw or /opt/brew true when %r{^/opt}, %r{^/sw}, %r{/usr/X11} @@ -201,7 +201,7 @@ class Cmd end def cpath 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, opt] end |
