aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/os
diff options
context:
space:
mode:
authorMike McQuaid2014-06-20 11:27:21 +0100
committerMike McQuaid2014-06-20 11:27:21 +0100
commitb0caede328b5181106451025df74a456276b76cf (patch)
tree3fe62a996427740f9aa368fd1e126f8aebbf4f4d /Library/Homebrew/os
parent354a17546e47938dd3e4b53a27ca9624a17c17e4 (diff)
downloadhomebrew-b0caede328b5181106451025df74a456276b76cf.tar.bz2
xcode: add new package ID for Mavericks.
Closes #30296.
Diffstat (limited to 'Library/Homebrew/os')
-rw-r--r--Library/Homebrew/os/mac/xcode.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb
index 7d8f12796..cdc9b54d6 100644
--- a/Library/Homebrew/os/mac/xcode.rb
+++ b/Library/Homebrew/os/mac/xcode.rb
@@ -146,7 +146,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"
+ MAVERICKS_PKG_IDS = ["com.apple.pkg.CLTools_Base",
+ "com.apple.pkg.CLTools_Executables"]
MAVERICKS_PKG_PATH = "/Library/Developer/CommandLineTools"
# Returns true even if outdated tools are installed, e.g.
@@ -181,7 +182,7 @@ module OS
end
def detect_version
- [MAVERICKS_PKG_ID, STANDALONE_PKG_ID, FROM_XCODE_PKG_ID].find do |id|
+ [*MAVERICKS_PKG_IDS, STANDALONE_PKG_ID, FROM_XCODE_PKG_ID].find do |id|
version = MacOS.pkgutil_info(id)[/version: (.+)$/, 1]
return version if version
end