diff options
Diffstat (limited to 'Library/Homebrew/os/mac/xcode.rb')
| -rw-r--r-- | Library/Homebrew/os/mac/xcode.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb index a89faa002..59bc199b2 100644 --- a/Library/Homebrew/os/mac/xcode.rb +++ b/Library/Homebrew/os/mac/xcode.rb @@ -33,15 +33,15 @@ module MacOS::Xcode extend self def prefix @prefix ||= begin path = Pathname.new(folder) - if path.absolute? and (path/'usr/bin/make').executable? + if path.absolute? and File.executable? "#{path}/usr/bin/make" path elsif File.executable? '/Developer/usr/bin/make' # we do this to support cowboys who insist on installing # only a subset of Xcode - Pathname.new '/Developer' - elsif (V4_BUNDLE_PATH/'Contents/Developer/usr/bin/make').executable? + Pathname.new('/Developer') + elsif File.executable? "#{V4_BUNDLE_PATH}/Contents/Developer/usr/bin/make" # fallback for broken Xcode 4.3 installs - V4_BUNDLE_PATH/'Contents/Developer' + Pathname.new("#{V4_BUNDLE_PATH}/Contents/Developer") else # Ask Spotlight where Xcode is. If the user didn't install the # helper tools and installed Xcode in a non-conventional place, this @@ -51,7 +51,7 @@ module MacOS::Xcode extend self unless path.nil? path += "Contents/Developer" - path if (path/'usr/bin/make').executable? + path if File.executable? "#{path}/usr/bin/make" end end end @@ -76,7 +76,7 @@ module MacOS::Xcode extend self # this shortcut makes version work for people who don't realise you # need to install the CLI tools - xcode43build = prefix/'usr/bin/xcodebuild' + xcode43build = Pathname.new("#{prefix}/usr/bin/xcodebuild") if xcode43build.file? `#{xcode43build} -version 2>/dev/null` =~ /Xcode (\d(\.\d)*)/ return $1 if $1 |