Work with Xcode 4.3 if user didn't install helper tools

We ask Spotlight to find Xcode and use that path, neat right?
This commit is contained in:
Max Howell 2012-02-17 12:12:05 +00:00
parent 856fe669e2
commit ba61d3013a
2 changed files with 11 additions and 2 deletions

View File

@ -96,7 +96,7 @@ module HomebrewEnvExtension
else
# otherwise lets try and figure it out ourselves
fn = "#{MacOS.dev_tools_path}/#{tool}"
if File.file? fn
if File.executable? fn
fn
else
nil

View File

@ -319,7 +319,16 @@ module MacOS extend self
# fallback for broken Xcode 4.3 installs
Pathname.new '/Applications/Xcode.app/Contents/Developer'
else
nil
# Ask Spotlight where Xcode is. If the user didn't install the
# helper tools and installed Xcode in a non-conventional place, this
# is our only option. See: http://superuser.com/questions/390757
path = `mdfind "kMDItemDisplayName==Xcode&&kMDItemKind==Application"`
path = "#{path}/Contents/Developer"
if path.empty? or not File.directory? path
nil
else
path
end
end
end
end