CLT: correctly find Mavericks CLT PKG.

Closes Homebrew/homebrew#23445.
This commit is contained in:
Mike McQuaid 2013-10-22 22:37:27 +01:00
parent 1be35f036e
commit 047c8eb927

View File

@ -164,6 +164,7 @@ module OS
STANDALONE_PKG_ID = "com.apple.pkg.DeveloperToolsCLILeo" STANDALONE_PKG_ID = "com.apple.pkg.DeveloperToolsCLILeo"
FROM_XCODE_PKG_ID = "com.apple.pkg.DeveloperToolsCLI" FROM_XCODE_PKG_ID = "com.apple.pkg.DeveloperToolsCLI"
MAVERICKS_PKG_ID = "com.apple.pkg.CLTools_Executables"
MAVERICKS_PKG_PATH = Pathname.new("/Library/Developer/CommandLineTools") MAVERICKS_PKG_PATH = Pathname.new("/Library/Developer/CommandLineTools")
# True if: # True if:
@ -201,7 +202,7 @@ module OS
end end
def detect_version def detect_version
[STANDALONE_PKG_ID, FROM_XCODE_PKG_ID].find do |id| [STANDALONE_PKG_ID, FROM_XCODE_PKG_ID, MAVERICKS_PKG_ID].find do |id|
version = MacOS.pkgutil_info(id)[/version: (.+)$/, 1] version = MacOS.pkgutil_info(id)[/version: (.+)$/, 1]
return version if version return version if version
end end