aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMike McQuaid2014-06-20 11:27:21 +0100
committerMike McQuaid2014-06-20 11:27:21 +0100
commit072261a9549923d457c44a2ee53c82606e69b675 (patch)
tree5ad23a891cd82d0d097b9570b9358cc3e59225cf /Library
parent1c176348caf6f6d220a1f877433a3ea581ab3030 (diff)
downloadbrew-072261a9549923d457c44a2ee53c82606e69b675.tar.bz2
xcode: add new package ID for Mavericks.
Closes Homebrew/homebrew#30296.
Diffstat (limited to 'Library')
-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