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

Merge pull request #6472 from EricFromCanada/json-api-update

Browse Source 
Cask: fixes for caveats output
This commit is contained in:
Mike McQuaid 2019-09-19 08:40:39 +01:00 committed by GitHub
commit 86e9af246b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/cask/cask.rb
View File

@ -147,7 +147,7 @@ module Cask
"version" => version, "version" => version,
"sha256" => sha256, "sha256" => sha256,
"artifacts" => artifacts.map(&method(:to_h_gsubs)), "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, "depends_on" => depends_on,
"conflicts_with" => conflicts_with, "conflicts_with" => conflicts_with,
"container" => container, "container" => container,

7
Library/Homebrew/cask/dsl/caveats.rb
View File

@ -87,17 +87,17 @@ module Cask
if java_version == :any if java_version == :any
<<~EOS <<~EOS
#{@cask} requires Java. You can install the latest version with: #{@cask} requires Java. You can install the latest version with:
brew cask install java brew cask install adoptopenjdk
EOS EOS
elsif java_version.include?("11") || java_version.include?("+") elsif java_version.include?("11") || java_version.include?("+")
<<~EOS <<~EOS
#{@cask} requires Java #{java_version}. You can install the latest version with: #{@cask} requires Java #{java_version}. You can install the latest version with:
brew cask install java brew cask install adoptopenjdk
EOS EOS
else else
<<~EOS <<~EOS
#{@cask} requires Java #{java_version}. You can install it with: #{@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 EOS
end end
end end
@ -118,7 +118,6 @@ module Cask
<<~EOS <<~EOS
#{@cask} has been officially discontinued upstream. #{@cask} has been officially discontinued upstream.
It may stop working correctly (or at all) in recent versions of macOS. It may stop working correctly (or at all) in recent versions of macOS.
EOS EOS
end end