aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/extend
diff options
context:
space:
mode:
authorTim D. Smith2016-03-16 22:09:41 -0700
committerXu Cheng2016-03-19 19:14:50 +0800
commitfe37cc52713e37c24ddf9a7a75f5118594acd3b1 (patch)
treea567aeda2f86866d94c33a6267d47f0ae827285e /Library/Homebrew/extend
parent87781f2a3734ad778660126fb2bc9681092f5951 (diff)
downloadbrew-fe37cc52713e37c24ddf9a7a75f5118594acd3b1.tar.bz2
Revert "Avoid constructing paths by string interpolation"
This reverts commit 8c7f3d859e8f715b6c63e4fe75e7a636aee4167f.
Diffstat (limited to 'Library/Homebrew/extend')
-rw-r--r--Library/Homebrew/extend/ENV/std.rb4
-rw-r--r--Library/Homebrew/extend/ENV/super.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb
index c75bed707..8bfc5ce57 100644
--- a/Library/Homebrew/extend/ENV/std.rb
+++ b/Library/Homebrew/extend/ENV/std.rb
@@ -67,8 +67,8 @@ module Stdenv
macosxsdk MacOS.version
if MacOS::Xcode.without_clt?
- append_path "PATH", (MacOS::Xcode.prefix/"usr/bin").to_s
- append_path "PATH", (MacOS::Xcode.toolchain_path/"usr/bin").to_s
+ append_path "PATH", "#{MacOS::Xcode.prefix}/usr/bin"
+ append_path "PATH", "#{MacOS::Xcode.toolchain_path}/usr/bin"
end
end
diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb
index 6fd259d81..c2401602f 100644
--- a/Library/Homebrew/extend/ENV/super.rb
+++ b/Library/Homebrew/extend/ENV/super.rb
@@ -119,8 +119,8 @@ module Superenv
# 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.
if MacOS::Xcode.without_clt? && MacOS.version <= "10.8"
- paths << (MacOS::Xcode.prefix/"usr/bin").to_s
- paths << (MacOS::Xcode.toolchain_path/"usr/bin").to_s
+ paths << "#{MacOS::Xcode.prefix}/usr/bin"
+ paths << "#{MacOS::Xcode.toolchain_path}/usr/bin"
end
paths << MacOS::X11.bin.to_s if x11?