os/mac/diagnostic: split some unless conditions.

This commit is contained in:
Mike McQuaid 2016-11-05 10:36:52 -04:00
parent bccd792bbf
commit 6359c75a2d

View File

@ -62,7 +62,8 @@ module Homebrew
end end
def check_xcode_up_to_date 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 message = <<-EOS.undent
Your Xcode (#{MacOS::Xcode.version}) is outdated. Your Xcode (#{MacOS::Xcode.version}) is outdated.
@ -83,7 +84,8 @@ module Homebrew
end end
def check_clt_up_to_date 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 <<-EOS.undent
A newer Command Line Tools release is available. A newer Command Line Tools release is available.
@ -94,7 +96,8 @@ module Homebrew
def check_xcode_8_without_clt_on_el_capitan def check_xcode_8_without_clt_on_el_capitan
return unless MacOS::Xcode.without_clt? return unless MacOS::Xcode.without_clt?
# Scope this to Xcode 8 on El Cap for now # 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 <<-EOS.undent
You have Xcode 8 installed without the CLT; You have Xcode 8 installed without the CLT;