diff options
| author | Misty De Meo | 2014-03-26 10:35:30 -0700 |
|---|---|---|
| committer | Misty De Meo | 2014-03-26 10:35:30 -0700 |
| commit | 76ded580abeaa8a34de16c1c0c817b0d1636579e (patch) | |
| tree | b81ce87abb585c7c7e0ef15e7b9ab775bdce5d7c /Library/Homebrew/os | |
| parent | 118e26c654bc42d9741b8a5385ac4b87cd4e2acd (diff) | |
| download | homebrew-76ded580abeaa8a34de16c1c0c817b0d1636579e.tar.bz2 | |
CLT.installed?: base result on version detection
CLT.installed? previously returned false if the user had outdated dev
tools installed after a 10.9 upgrade, which was confusing to users.
Diffstat (limited to 'Library/Homebrew/os')
| -rw-r--r-- | Library/Homebrew/os/mac/xcode.rb | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb index b2e5611e7..c55ef0f27 100644 --- a/Library/Homebrew/os/mac/xcode.rb +++ b/Library/Homebrew/os/mac/xcode.rb @@ -172,18 +172,10 @@ module OS MAVERICKS_PKG_ID = "com.apple.pkg.CLTools_Executables" MAVERICKS_PKG_PATH = Pathname.new("/Library/Developer/CommandLineTools") - # True if: - # - Xcode < 4.3 is installed. The tools are found under /usr. - # - The "Command Line Tools" package has been installed. - # For OS X < 10.9, the tools are found under /usr. 10.9 always - # includes tools there, which run the real tools inside Xcode on - # Xcode-only installs, so it's necessary to look elsewhere. + # Returns true even if outdated tools are installed, e.g. + # tools from Xcode 4.x on 10.9 def installed? - if MacOS.version < :mavericks - usr_dev_tools? - else - mavericks_dev_tools? - end + !!detect_version end def mavericks_dev_tools? |