aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2015-02-07 13:20:10 -0500
committerJack Nagel2015-02-07 13:54:33 -0500
commitb5ab4744bbd88dc65c8e6fb0f54b90dc8f535611 (patch)
tree7c7d1f069be51c994dceb79a842e853aca3e3a3b /Library
parent551ea405f53c16cad6762238176e87ed37e7d58b (diff)
downloadhomebrew-b5ab4744bbd88dc65c8e6fb0f54b90dc8f535611.tar.bz2
Use start_with? to simplify path sanity check
Diffstat (limited to 'Library')
-rwxr-xr-xLibrary/ENV/4.3/cc10
1 files changed, 1 insertions, 9 deletions
diff --git a/Library/ENV/4.3/cc b/Library/ENV/4.3/cc
index 4ab9dc671..65a95d373 100755
--- a/Library/ENV/4.3/cc
+++ b/Library/ENV/4.3/cc
@@ -199,15 +199,7 @@ class Cmd
end
def keep? path
- case path
- when %r{^#{Regexp.escape(prefix)}}o, %r{^#{Regexp.escape(cellar)}}o, %r{^#{Regexp.escape(tmpdir)}}o
- # maybe homebrew is installed to /sw or /opt/brew
- true
- when %r{^/opt}, %r{^/sw}, %r{/usr/X11}
- false
- else
- true
- end
+ path.start_with?(prefix, cellar, tmpdir) || !path.start_with?("/opt", "/sw", "/usr/X11")
end
def cflags