Revert "xcode: add new package ID for Mavericks."

This reverts commit b0caede328b5181106451025df74a456276b76cf.

Fixes Homebrew/homebrew#30299.
This commit is contained in:
Mike McQuaid 2014-06-20 12:18:28 +01:00
parent 072261a954
commit e83b6a6b45

View File

@ -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