From fe37cc52713e37c24ddf9a7a75f5118594acd3b1 Mon Sep 17 00:00:00 2001
From: "Tim D. Smith" <git@tim-smith.us>
Date: Wed, 16 Mar 2016 22:09:41 -0700
Subject: [PATCH] Revert "Avoid constructing paths by string interpolation"

This reverts commit 8c7f3d859e8f715b6c63e4fe75e7a636aee4167f.
---
 Library/Homebrew/extend/ENV/std.rb   | 4 ++--
 Library/Homebrew/extend/ENV/super.rb | 4 ++--
 Library/Homebrew/os/mac/sdk.rb       | 2 +-
 Library/Homebrew/os/mac/xcode.rb     | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb
index c75bed7072..8bfc5ce570 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 6fd259d815..c2401602f3 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?
diff --git a/Library/Homebrew/os/mac/sdk.rb b/Library/Homebrew/os/mac/sdk.rb
index 01e4170ac9..8ba5f43294 100644
--- a/Library/Homebrew/os/mac/sdk.rb
+++ b/Library/Homebrew/os/mac/sdk.rb
@@ -33,7 +33,7 @@ module OS
       def sdk_paths
         @sdk_paths ||= begin
           # Xcode.prefix is pretty smart, so let's look inside to find the sdk
-          sdk_prefix = (Xcode.prefix/"Platforms/MacOSX.platform/Developer/SDKs").to_s
+          sdk_prefix = "#{Xcode.prefix}/Platforms/MacOSX.platform/Developer/SDKs"
           # Xcode < 4.3 style
           sdk_prefix = "/Developer/SDKs" unless File.directory? sdk_prefix
           # Finally query Xcode itself (this is slow, so check it last)
diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb
index 31b6d227d8..b951b1232a 100644
--- a/Library/Homebrew/os/mac/xcode.rb
+++ b/Library/Homebrew/os/mac/xcode.rb
@@ -50,7 +50,7 @@ module OS
       end
 
       def toolchain_path
-        (prefix/"Toolchains/XcodeDefault.xctoolchain") if installed? && version >= "4.3"
+        Pathname.new("#{prefix}/Toolchains/XcodeDefault.xctoolchain") if installed? && version >= "4.3"
       end
 
       # 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?
 
-        [(prefix/"usr/bin/xcodebuild"), which("xcodebuild")].uniq.each do |path|
-          if path.file?
+        %W[#{prefix}/usr/bin/xcodebuild #{which("xcodebuild")}].uniq.each do |path|
+          if File.file? path
             Utils.popen_read(path, "-version") =~ /Xcode (\d(\.\d)*)/
             return $1 if $1
           end