From ccc0eb98ba2327c0a5f8b76b976538748d92dcc0 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Fri, 27 Dec 2013 13:01:41 -0600 Subject: [PATCH] Escape prefix when interpolating into regexp --- Library/ENV/4.3/cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/ENV/4.3/cc b/Library/ENV/4.3/cc index ba9d692854..6a9407d037 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