diff options
| author | Jack Nagel | 2012-12-29 17:16:38 -0600 |
|---|---|---|
| committer | Jack Nagel | 2012-12-30 19:23:53 -0600 |
| commit | de1eabf22c0137e4e0ad8c34cc47fd86cb78e557 (patch) | |
| tree | 589daf938cc90ffb9f2b2f21ce1ff58e6f5a8d7a /Library | |
| parent | 9362a7c89732a1cea6a1ada1062fedcf24505b8a (diff) | |
| download | brew-de1eabf22c0137e4e0ad8c34cc47fd86cb78e557.tar.bz2 | |
Fix some doublethink in the Xcode module
Xcode.prefix and Xcode.installed? use slightly different heuristics to
find Xcode. In fact, .installed? basically duplicates a portion of the
.prefix logic. In practice, the methods results are usually consistent,
but .installed? does not handle non-standard prefixes if mdfind cannot
locate Xcode (for example, if the user has disabled Spotlight indexing).
Since .installed? is essentially a subset of the .prefix logic, we can
rely on the result from .prefix instead.
Fixes Homebrew/homebrew#16790.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/macos/xcode.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Library/Homebrew/macos/xcode.rb b/Library/Homebrew/macos/xcode.rb index ab297f2c5..552bc2c12 100644 --- a/Library/Homebrew/macos/xcode.rb +++ b/Library/Homebrew/macos/xcode.rb @@ -58,12 +58,7 @@ module MacOS::Xcode extend self end def installed? - # Telling us whether the Xcode.app is installed or not. - @installed ||= V4_BUNDLE_PATH.exist? || - V3_BUNDLE_PATH.exist? || - MacOS.app_with_bundle_id(V4_BUNDLE_ID) || - MacOS.app_with_bundle_id(V3_BUNDLE_ID) || - false + not prefix.nil? end def version |