trim line breaks

This commit is contained in:
EricFromCanada 2019-04-13 21:28:56 -04:00
parent 89f0fcedbe
commit e0558dc7c7
5 changed files with 2 additions and 15 deletions

View File

@ -16,7 +16,6 @@ module Cask
puts <<~EOS puts <<~EOS
To complete the installation of Cask #{cask}, you must also To complete the installation of Cask #{cask}, you must also
run the installer at: run the installer at:
'#{cask.staged_path.join(path)}' '#{cask.staged_path.join(path)}'
EOS EOS
end end

View File

@ -48,11 +48,8 @@ module Cask
<<~EOS <<~EOS
To install and/or use #{@cask} you may need to enable its kernel extension in: To install and/or use #{@cask} you may need to enable its kernel extension in:
System Preferences Security & Privacy General System Preferences Security & Privacy General
For more information refer to vendor documentation or this Apple Technical Note: For more information refer to vendor documentation or this Apple Technical Note:
#{Formatter.url("https://developer.apple.com/library/content/technotes/tn2459/_index.html")} #{Formatter.url("https://developer.apple.com/library/content/technotes/tn2459/_index.html")}
EOS EOS
end end
@ -61,7 +58,6 @@ module Cask
<<~EOS <<~EOS
To use #{@cask}, you may need to add the #{path} directory To use #{@cask}, you may need to add the #{path} directory
to your PATH environment variable, e.g. (for bash shell): to your PATH environment variable, e.g. (for bash shell):
export PATH=#{path}:"$PATH" export PATH=#{path}:"$PATH"
EOS EOS
end end
@ -71,7 +67,6 @@ module Cask
To use #{@cask}, zsh users may need to add the following line to their To use #{@cask}, zsh users may need to add the following line to their
~/.zprofile. (Among other effects, #{path} will be added to the ~/.zprofile. (Among other effects, #{path} will be added to the
PATH environment variable): PATH environment variable):
eval `/usr/libexec/path_helper -s` eval `/usr/libexec/path_helper -s`
EOS EOS
end end
@ -90,19 +85,16 @@ 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 java
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 java
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/java#{java_version}
EOS EOS
end end

View File

@ -131,13 +131,11 @@ module Cask
def to_s def to_s
<<~EOS <<~EOS
Checksum for Cask '#{token}' does not match. Checksum for Cask '#{token}' does not match.
Expected: #{Formatter.success(expected.to_s)} Expected: #{Formatter.success(expected.to_s)}
Actual: #{Formatter.error(actual.to_s)} Actual: #{Formatter.error(actual.to_s)}
File: #{path} File: #{path}
To retry an incomplete download, remove the file above.
To retry an incomplete download, remove the file above. If the issue persists, visit: If the issue persists, visit:
#{Formatter.url("https://github.com/Homebrew/homebrew-cask/blob/master/doc/reporting_bugs/checksum_does_not_match_error.md")} #{Formatter.url("https://github.com/Homebrew/homebrew-cask/blob/master/doc/reporting_bugs/checksum_does_not_match_error.md")}
EOS EOS
end end

View File

@ -84,7 +84,6 @@ describe Cask::Cmd::Info, :cask do
Custom text via puts followed by DSL-generated text: Custom text via puts followed by DSL-generated text:
To use with-caveats, you may need to add the /custom/path/bin directory To use with-caveats, you may need to add the /custom/path/bin directory
to your PATH environment variable, e.g. (for bash shell): to your PATH environment variable, e.g. (for bash shell):
export PATH=/custom/path/bin:"$PATH" export PATH=/custom/path/bin:"$PATH"
EOS EOS

View File

@ -118,7 +118,6 @@ describe Cask::Installer, :cask do
==> Installing Cask with-installer-manual ==> Installing Cask with-installer-manual
To complete the installation of Cask with-installer-manual, you must also To complete the installation of Cask with-installer-manual, you must also
run the installer at: run the installer at:
'#{with_installer_manual.staged_path.join("Caffeine.app")}' '#{with_installer_manual.staged_path.join("Caffeine.app")}'
🍺 with-installer-manual was successfully installed! 🍺 with-installer-manual was successfully installed!
EOS EOS