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

Avoid constructing paths by string interpolation

Browse Source 
Closes Homebrew/homebrew#50154.
This commit is contained in:
Tim D. Smith 2016-03-15 23:47:54 -07:00 committed by Xu Cheng
parent f0a5abe12e
commit 87781f2a37
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/extend/ENV/std.rb
View File

@ -67,8 +67,8 @@ module Stdenv
macosxsdk MacOS.version macosxsdk MacOS.version
if MacOS::Xcode.without_clt? if MacOS::Xcode.without_clt?
append_path "PATH", "#{MacOS::Xcode.prefix}/usr/bin" append_path "PATH", (MacOS::Xcode.prefix/"usr/bin").to_s
append_path "PATH", "#{MacOS::Xcode.toolchain_path}/usr/bin" append_path "PATH", (MacOS::Xcode.toolchain_path/"usr/bin").to_s
end end
end end

4
Library/Homebrew/extend/ENV/super.rb
View File

@ -119,8 +119,8 @@ module Superenv
# On 10.9, there are shims for all tools in /usr/bin. # On 10.9, there are shims for all tools in /usr/bin.
# On 10.7 and 10.8 we need to add these directories ourselves. # On 10.7 and 10.8 we need to add these directories ourselves.
if MacOS::Xcode.without_clt? && MacOS.version <= "10.8" if MacOS::Xcode.without_clt? && MacOS.version <= "10.8"
paths << "#{MacOS::Xcode.prefix}/usr/bin" paths << (MacOS::Xcode.prefix/"usr/bin").to_s
paths << "#{MacOS::Xcode.toolchain_path}/usr/bin" paths << (MacOS::Xcode.toolchain_path/"usr/bin").to_s
end end
paths << MacOS::X11.bin.to_s if x11? paths << MacOS::X11.bin.to_s if x11?

2
Library/Homebrew/os/mac/sdk.rb
View File

@ -33,7 +33,7 @@ module OS
def sdk_paths def sdk_paths
@sdk_paths ||= begin @sdk_paths ||= begin
# Xcode.prefix is pretty smart, so let's look inside to find the sdk # Xcode.prefix is pretty smart, so let's look inside to find the sdk
sdk_prefix = "#{Xcode.prefix}/Platforms/MacOSX.platform/Developer/SDKs" sdk_prefix = (Xcode.prefix/"Platforms/MacOSX.platform/Developer/SDKs").to_s
# Xcode < 4.3 style # Xcode < 4.3 style
sdk_prefix = "/Developer/SDKs" unless File.directory? sdk_prefix sdk_prefix = "/Developer/SDKs" unless File.directory? sdk_prefix
# Finally query Xcode itself (this is slow, so check it last) # Finally query Xcode itself (this is slow, so check it last)

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

@ -50,7 +50,7 @@ module OS
end end
def toolchain_path def toolchain_path
Pathname.new("#{prefix}/Toolchains/XcodeDefault.xctoolchain") if installed? && version >= "4.3" (prefix/"Toolchains/XcodeDefault.xctoolchain") if installed? && version >= "4.3"
end end
# Ask Spotlight where Xcode is. If the user didn't install the # Ask Spotlight where Xcode is. If the user didn't install the
@ -79,8 +79,8 @@ module OS
return nil if !MacOS::Xcode.installed? && !MacOS::CLT.installed? return nil if !MacOS::Xcode.installed? && !MacOS::CLT.installed?
%W[#{prefix}/usr/bin/xcodebuild #{which("xcodebuild")}].uniq.each do |path| [(prefix/"usr/bin/xcodebuild"), which("xcodebuild")].uniq.each do |path|
if File.file? path if path.file?
Utils.popen_read(path, "-version") =~ /Xcode (\d(\.\d)*)/ Utils.popen_read(path, "-version") =~ /Xcode (\d(\.\d)*)/
return $1 if $1 return $1 if $1
end end