aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMike McQuaid2014-06-20 12:59:11 +0100
committerMike McQuaid2014-06-20 12:59:11 +0100
commitf2dd0a62cb388832143bb8da4b30c61faa9028fd (patch)
tree2c7196a427408564c888c0a36e501372ce53278c /Library
parent45f5f33931ca5b6d3bf2a79a3f9eb21f34b1fdd8 (diff)
downloadhomebrew-f2dd0a62cb388832143bb8da4b30c61faa9028fd.tar.bz2
xcode: add new package ID for Mavericks (again).
Closes #30296.
Diffstat (limited to 'Library')
-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