diff options
| author | Jack Nagel | 2014-10-10 13:06:50 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-10-10 13:08:50 -0500 |
| commit | da56a4502597a7ea6380e9443ecb70411d59650b (patch) | |
| tree | 79ba8e8ca7f67032573afc2b0ad73d1b1a636aca /Library | |
| parent | 7b550b9486b53f8987e18a2e27b7e8c137391a94 (diff) | |
| download | brew-da56a4502597a7ea6380e9443ecb70411d59650b.tar.bz2 | |
Prefer current CLT package ID
It seems that "com.apple.pkg.CLTools_Base" was only used for one
release. New releases are using "com.apple.pkg.CLTools_Executables"
again.
Fixes Homebrew/homebrew#33063.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/os/mac/xcode.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb index 5cf40277d..f24d36e6f 100644 --- a/Library/Homebrew/os/mac/xcode.rb +++ b/Library/Homebrew/os/mac/xcode.rb @@ -149,8 +149,7 @@ 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" - # Used for Yosemite and Mavericks CLT since June 2014. - MAVERICKS_NEW_PKG_ID = "com.apple.pkg.CLTools_Base" + MAVERICKS_NEW_PKG_ID = "com.apple.pkg.CLTools_Base" # obsolete MAVERICKS_PKG_PATH = "/Library/Developer/CommandLineTools" # Returns true even if outdated tools are installed, e.g. @@ -187,7 +186,7 @@ module OS end def detect_version - [MAVERICKS_NEW_PKG_ID, MAVERICKS_PKG_ID, STANDALONE_PKG_ID, FROM_XCODE_PKG_ID].find do |id| + [MAVERICKS_PKG_ID, MAVERICKS_NEW_PKG_ID, STANDALONE_PKG_ID, FROM_XCODE_PKG_ID].find do |id| version = MacOS.pkgutil_info(id)[/version: (.+)$/, 1] return version if version end |