aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew
diff options
context:
space:
mode:
authorMike McQuaid2016-11-05 10:36:52 -0400
committerMike McQuaid2016-11-05 10:58:39 -0400
commit6359c75a2dea3673284bc5f9b00d1ed790469e7b (patch)
tree4bc9fd7766607f294a044ea6df7eb4c5d6485552 /Library/Homebrew
parentbccd792bbffaf0c219f402d893be4c5c0d284d97 (diff)
downloadbrew-6359c75a2dea3673284bc5f9b00d1ed790469e7b.tar.bz2
os/mac/diagnostic: split some unless conditions.
Diffstat (limited to 'Library/Homebrew')
-rw-r--r--Library/Homebrew/extend/os/mac/diagnostic.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb
index 883565749..6649865ba 100644
--- a/Library/Homebrew/extend/os/mac/diagnostic.rb
+++ b/Library/Homebrew/extend/os/mac/diagnostic.rb
@@ -62,7 +62,8 @@ module Homebrew
end
def check_xcode_up_to_date
- return unless MacOS::Xcode.installed? && MacOS::Xcode.outdated?
+ return unless MacOS::Xcode.installed?
+ return unless MacOS::Xcode.outdated?
message = <<-EOS.undent
Your Xcode (#{MacOS::Xcode.version}) is outdated.
@@ -83,7 +84,8 @@ module Homebrew
end
def check_clt_up_to_date
- return unless MacOS::CLT.installed? && MacOS::CLT.outdated?
+ return unless MacOS::CLT.installed?
+ return unless MacOS::CLT.outdated?
<<-EOS.undent
A newer Command Line Tools release is available.
@@ -94,7 +96,8 @@ module Homebrew
def check_xcode_8_without_clt_on_el_capitan
return unless MacOS::Xcode.without_clt?
# Scope this to Xcode 8 on El Cap for now
- return unless MacOS.version == :el_capitan && MacOS::Xcode.version >= "8"
+ return unless MacOS.version == :el_capitan
+ return unless MacOS::Xcode.version >= "8"
<<-EOS.undent
You have Xcode 8 installed without the CLT;