admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

diagnostic: simplify version checks.

Browse Source
This commit is contained in:
Mike McQuaid 2017-11-05 12:12:39 +00:00
parent b69d71edea
commit 8c6defd9cf
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Library/Homebrew/extend/os/mac/diagnostic.rb
View File

@ -50,7 +50,6 @@ module Homebrew
end end
def check_xcode_up_to_date def check_xcode_up_to_date
return unless MacOS::Xcode.installed?
return unless MacOS::Xcode.outdated? return unless MacOS::Xcode.outdated?
# Travis CI images are going to end up outdated so don't complain when # Travis CI images are going to end up outdated so don't complain when
@ -78,7 +77,6 @@ module Homebrew
end end
def check_clt_up_to_date def check_clt_up_to_date
return unless MacOS::CLT.installed?
return unless MacOS::CLT.outdated? return unless MacOS::CLT.outdated?
# Travis CI images are going to end up outdated so don't complain when # Travis CI images are going to end up outdated so don't complain when
@ -108,7 +106,6 @@ module Homebrew
end end
def check_xcode_minimum_version def check_xcode_minimum_version
return unless MacOS::Xcode.installed?
return unless MacOS::Xcode.below_minimum_version? return unless MacOS::Xcode.below_minimum_version?
<<~EOS <<~EOS
@ -119,7 +116,6 @@ module Homebrew
end end
def check_clt_minimum_version def check_clt_minimum_version
return unless MacOS::CLT.installed?
return unless MacOS::CLT.below_minimum_version? return unless MacOS::CLT.below_minimum_version?
<<~EOS <<~EOS
@ -281,13 +277,8 @@ module Homebrew
EOS EOS
end end
def check_for_latest_xquartz def check_xquartz_up_to_date
return unless MacOS::XQuartz.version return unless MacOS::XQuartz.outdated?
return if MacOS::XQuartz.provided_by_apple?
installed_version = Version.create(MacOS::XQuartz.version)
latest_version = Version.create(MacOS::XQuartz.latest_version)
return if installed_version >= latest_version
<<~EOS <<~EOS
Your XQuartz (#{installed_version}) is outdated. Your XQuartz (#{installed_version}) is outdated.
@ -298,8 +289,7 @@ module Homebrew
end end
def check_for_beta_xquartz def check_for_beta_xquartz
return unless MacOS::XQuartz.version return unless MacOS::XQuartz.version.to_s.include?("beta")
return unless MacOS::XQuartz.version.include? "beta"
<<~EOS <<~EOS
The following beta release of XQuartz is installed: #{MacOS::XQuartz.version} The following beta release of XQuartz is installed: #{MacOS::XQuartz.version}