aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2013-07-21 16:41:51 -0500
committerJack Nagel2013-07-21 16:41:51 -0500
commit3dfb3264211b9488f06583788c6beecfc84d043e (patch)
tree6564eab08408b42009eabc693bb3e523ff2201d8 /Library
parent361d224e99bd854fa279d1eb638c512ef1e8ea7d (diff)
downloadhomebrew-3dfb3264211b9488f06583788c6beecfc84d043e.tar.bz2
Extract bundle_path method from Xcode#prefix
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/os/mac/xcode.rb13
1 files changed, 8 insertions, 5 deletions
diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb
index 709d41a04..31dbf8c02 100644
--- a/Library/Homebrew/os/mac/xcode.rb
+++ b/Library/Homebrew/os/mac/xcode.rb
@@ -51,11 +51,7 @@ module MacOS::Xcode extend self
# fallback for broken Xcode 4.3 installs
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
- # is our only option. See: http://superuser.com/questions/390757
- path = MacOS.app_with_bundle_id(V4_BUNDLE_ID) ||
- MacOS.app_with_bundle_id(V3_BUNDLE_ID)
+ path = bundle_path
unless path.nil?
path += "Contents/Developer"
@@ -65,6 +61,13 @@ module MacOS::Xcode extend self
end
end
+ # 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
+ def bundle_path
+ MacOS.app_with_bundle_id(V4_BUNDLE_ID) || MacOS.app_with_bundle_id(V3_BUNDLE_ID)
+ end
+
def installed?
not prefix.nil?
end