aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/os/mac/xcode.rb
diff options
context:
space:
mode:
authorMike McQuaid2014-06-20 12:59:11 +0100
committerMike McQuaid2014-06-20 12:59:11 +0100
commit2f8adead9f545ec67c335e303e96a62d20f27fb4 (patch)
treef5b81bbbd3a89dc9a7f087f80d422f26fd271dbe /Library/Homebrew/os/mac/xcode.rb
parente83b6a6b4566b3265442a33d4e97aa7f0fdad26a (diff)
downloadbrew-2f8adead9f545ec67c335e303e96a62d20f27fb4.tar.bz2
xcode: add new package ID for Mavericks (again).
Closes Homebrew/homebrew#30296.
Diffstat (limited to 'Library/Homebrew/os/mac/xcode.rb')
-rw-r--r--Library/Homebrew/os/mac/xcode.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb
index 7d8f12796..0718ce89a 100644
--- a/Library/Homebrew/os/mac/xcode.rb
+++ b/Library/Homebrew/os/mac/xcode.rb
@@ -147,6 +147,8 @@ module OS
STANDALONE_PKG_ID = "com.apple.pkg.DeveloperToolsCLILeo"
FROM_XCODE_PKG_ID = "com.apple.pkg.DeveloperToolsCLI"
MAVERICKS_PKG_ID = "com.apple.pkg.CLTools_Executables"
+ # Used for Yosemite and Mavericks CLT since June 2014.
+ MAVERICKS_NEW_PKG_ID = "com.apple.pkg.CLTools_Base"
MAVERICKS_PKG_PATH = "/Library/Developer/CommandLineTools"
# Returns true even if outdated tools are installed, e.g.
@@ -181,7 +183,7 @@ module OS
end
def detect_version
- [MAVERICKS_PKG_ID, STANDALONE_PKG_ID, FROM_XCODE_PKG_ID].find do |id|
+ [MAVERICKS_NEW_PKG_ID, MAVERICKS_PKG_ID, STANDALONE_PKG_ID, FROM_XCODE_PKG_ID].find do |id|
version = MacOS.pkgutil_info(id)[/version: (.+)$/, 1]
return version if version
end