From 9f2f5c81e9959f208a5f553b1b0aa119afb000e7 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sun, 21 Jul 2013 16:41:51 -0500 Subject: [PATCH] Extract bundle_path method from Xcode#prefix --- Library/Homebrew/os/mac/xcode.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb index 709d41a040..31dbf8c028 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