aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/os/mac/xcode.rb
diff options
context:
space:
mode:
authorMike McQuaid2014-06-20 12:18:28 +0100
committerMike McQuaid2014-06-20 12:18:28 +0100
commite83b6a6b4566b3265442a33d4e97aa7f0fdad26a (patch)
treee761ddfbb2b169150f26f8d6d83263cc6663418e /Library/Homebrew/os/mac/xcode.rb
parent072261a9549923d457c44a2ee53c82606e69b675 (diff)
downloadbrew-e83b6a6b4566b3265442a33d4e97aa7f0fdad26a.tar.bz2
Revert "xcode: add new package ID for Mavericks."
This reverts commit b0caede328b5181106451025df74a456276b76cf. Fixes Homebrew/homebrew#30299.
Diffstat (limited to 'Library/Homebrew/os/mac/xcode.rb')
-rw-r--r--Library/Homebrew/os/mac/xcode.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb
index cdc9b54d6..7d8f12796 100644
--- a/Library/Homebrew/os/mac/xcode.rb
+++ b/Library/Homebrew/os/mac/xcode.rb
@@ -146,8 +146,7 @@ module OS
STANDALONE_PKG_ID = "com.apple.pkg.DeveloperToolsCLILeo"
FROM_XCODE_PKG_ID = "com.apple.pkg.DeveloperToolsCLI"
- MAVERICKS_PKG_IDS = ["com.apple.pkg.CLTools_Base",
- "com.apple.pkg.CLTools_Executables"]
+ MAVERICKS_PKG_ID = "com.apple.pkg.CLTools_Executables"
MAVERICKS_PKG_PATH = "/Library/Developer/CommandLineTools"
# Returns true even if outdated tools are installed, e.g.
@@ -182,7 +181,7 @@ module OS
end
def detect_version
- [*MAVERICKS_PKG_IDS, STANDALONE_PKG_ID, FROM_XCODE_PKG_ID].find do |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