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

os/mac: use start_with? when possible

Browse Source 
Closes Homebrew/homebrew#48071.

Signed-off-by: Baptiste Fontaine <batifon@yahoo.fr>
This commit is contained in:
Baptiste Fontaine 2016-01-14 13:57:18 +01:00
parent 7faae5adf2
commit 92a71a534f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/os/mac.rb
View File

@ -141,7 +141,7 @@ module OS
@gcc_42_build_version ||= @gcc_42_build_version ||=
begin begin
gcc = MacOS.locate("gcc-4.2") || HOMEBREW_PREFIX.join("opt/apple-gcc42/bin/gcc-4.2") gcc = MacOS.locate("gcc-4.2") || HOMEBREW_PREFIX.join("opt/apple-gcc42/bin/gcc-4.2")
if gcc.exist? && gcc.realpath.basename.to_s !~ /^llvm/ if gcc.exist? && !gcc.realpath.basename.to_s.start_with?("llvm")
`#{gcc} --version`[/build (\d{4,})/, 1].to_i `#{gcc} --version`[/build (\d{4,})/, 1].to_i
end end
end end
@ -150,7 +150,7 @@ module OS
def llvm_build_version def llvm_build_version
@llvm_build_version ||= @llvm_build_version ||=
if (path = locate("llvm-gcc")) && path.realpath.basename.to_s !~ /^clang/ if (path = locate("llvm-gcc")) && !path.realpath.basename.to_s.start_with?("clang")
`#{path} --version`[/LLVM build (\d{4,})/, 1].to_i `#{path} --version`[/LLVM build (\d{4,})/, 1].to_i
end end
end end

4
Library/Homebrew/os/mac/xcode.rb
View File

@ -141,9 +141,9 @@ module OS
def default_prefix? def default_prefix?
if version < "4.3" if version < "4.3"
%r{^/Developer} === prefix prefix.to_s.start_with? "/Developer"
else else
%r{^/Applications/Xcode.app} === prefix prefix.to_s.start_with? "/Applications/Xcode.app"
end end
end end
end end