From a9b9d4613decfca219ba07b752e7ef1df58f72c3 Mon Sep 17 00:00:00 2001 From: EricFromCanada Date: Sat, 14 Sep 2019 10:08:42 -0400 Subject: [PATCH 1/3] cask: return nil instead of "" if no caveats --- Library/Homebrew/cask/cask.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/cask/cask.rb b/Library/Homebrew/cask/cask.rb index ec03c0bfbc3d5..15211e79e3d21 100644 --- a/Library/Homebrew/cask/cask.rb +++ b/Library/Homebrew/cask/cask.rb @@ -147,7 +147,7 @@ def to_h "version" => version, "sha256" => sha256, "artifacts" => artifacts.map(&method(:to_h_gsubs)), - "caveats" => to_h_string_gsubs(caveats), + "caveats" => (to_h_string_gsubs(caveats) unless caveats.empty?), "depends_on" => depends_on, "conflicts_with" => conflicts_with, "container" => container, From de26e491e23683ac99b051f64eec4beaf56e4734 Mon Sep 17 00:00:00 2001 From: EricFromCanada Date: Sat, 14 Sep 2019 10:17:02 -0400 Subject: [PATCH 2/3] cask: remove extra line break in :discontinued caveat --- Library/Homebrew/cask/dsl/caveats.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/Library/Homebrew/cask/dsl/caveats.rb b/Library/Homebrew/cask/dsl/caveats.rb index 2ddd19b05591f..1c0e12eace9ec 100644 --- a/Library/Homebrew/cask/dsl/caveats.rb +++ b/Library/Homebrew/cask/dsl/caveats.rb @@ -118,7 +118,6 @@ def eval_caveats(&block) <<~EOS #{@cask} has been officially discontinued upstream. It may stop working correctly (or at all) in recent versions of macOS. - EOS end From c9a75db27d36dcf3a8fa85590e7e3c0b61de3862 Mon Sep 17 00:00:00 2001 From: EricFromCanada Date: Sat, 14 Sep 2019 11:23:41 -0400 Subject: [PATCH 3/3] cask: recommend adoptopenjdk as per #6040 --- Library/Homebrew/cask/dsl/caveats.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/cask/dsl/caveats.rb b/Library/Homebrew/cask/dsl/caveats.rb index 1c0e12eace9ec..2b635931a8ac4 100644 --- a/Library/Homebrew/cask/dsl/caveats.rb +++ b/Library/Homebrew/cask/dsl/caveats.rb @@ -87,17 +87,17 @@ def eval_caveats(&block) if java_version == :any <<~EOS #{@cask} requires Java. You can install the latest version with: - brew cask install java + brew cask install adoptopenjdk EOS elsif java_version.include?("11") || java_version.include?("+") <<~EOS #{@cask} requires Java #{java_version}. You can install the latest version with: - brew cask install java + brew cask install adoptopenjdk EOS else <<~EOS #{@cask} requires Java #{java_version}. You can install it with: - brew cask install homebrew/cask-versions/java#{java_version} + brew cask install homebrew/cask-versions/adoptopenjdk#{java_version} EOS end end