Merge pull request #803 from reitermarkus/heredoc-style

Unify heredoc style.

4 files changed, 12 insertions, 12 deletions

diff --git a/Library/Homebrew/cask/lib/hbc/cli.rb b/Library/Homebrew/cask/lib/hbc/cli.rb
index d1fb99108..1378176da 100644
--- a/Library/Homebrew/cask/lib/hbc/cli.rb
+++ b/Library/Homebrew/cask/lib/hbc/cli.rb
@@ -187,10 +187,10 @@ class Hbc::CLI
       end
 
       opts.on("--binarydir=PATH") do
-        opoo <<-EOF.undent
+        opoo <<-EOS.undent
           Option --binarydir is obsolete!
           Homebrew-Cask now uses the same location as your Homebrew installation for executable links.
-        EOF
+        EOS
       end
 
       FLAGS.each do |flag, method|
@@ -246,11 +246,11 @@ class Hbc::CLI
     end
 
     def purpose
-      puts <<-PURPOSE.undent
+      puts <<-EOS.undent
         brew-cask provides a friendly homebrew-style CLI workflow for the
         administration of macOS applications distributed as binaries.
 
-      PURPOSE
+      EOS
     end
 
     def usage
diff --git a/Library/Homebrew/cask/lib/hbc/cli/uninstall.rb b/Library/Homebrew/cask/lib/hbc/cli/uninstall.rb
index cd98b6e61..ae15414b7 100644
--- a/Library/Homebrew/cask/lib/hbc/cli/uninstall.rb
+++ b/Library/Homebrew/cask/lib/hbc/cli/uninstall.rb
@@ -27,10 +27,10 @@ class Hbc::CLI::Uninstall < Hbc::CLI::Base
 
       single = versions.count == 1
 
-      puts <<-EOF.undent
+      puts <<-EOS.undent
         #{cask_token} #{versions.join(', ')} #{single ? 'is' : 'are'} still installed.
         Remove #{single ? 'it' : 'them all'} with `brew cask uninstall --force #{cask_token}`.
-      EOF
+      EOS
     end
   end
 
diff --git a/Library/Homebrew/cask/lib/hbc/container/air.rb b/Library/Homebrew/cask/lib/hbc/container/air.rb
index e82b677e9..fc618db83 100644
--- a/Library/Homebrew/cask/lib/hbc/container/air.rb
+++ b/Library/Homebrew/cask/lib/hbc/container/air.rb
@@ -11,12 +11,12 @@ class Hbc::Container::Air < Hbc::Container::Base
 
   def self.installer_cmd
     return @installer_cmd ||= INSTALLER_PATHNAME if installer_exist?
-    raise Hbc::CaskError, <<-ERRMSG.undent
+    raise Hbc::CaskError, <<-EOS.undent
       Adobe AIR runtime not present, try installing it via
 
           brew cask install adobe-air
 
-    ERRMSG
+    EOS
   end
 
   def self.installer_exist?
diff --git a/Library/Homebrew/cask/lib/hbc/system_command.rb b/Library/Homebrew/cask/lib/hbc/system_command.rb
index 6fa8a901f..bb8d91504 100644
--- a/Library/Homebrew/cask/lib/hbc/system_command.rb
+++ b/Library/Homebrew/cask/lib/hbc/system_command.rb
@@ -150,17 +150,17 @@ class Hbc::SystemCommand::Result
     _warn_plist_garbage(command, Regexp.last_match[2])
     xml = Plist.parse_xml(output)
     unless xml.respond_to?(:keys) && !xml.keys.empty?
-      raise Hbc::CaskError, <<-ERRMSG
+      raise Hbc::CaskError, <<-EOS
 Empty result parsing plist output from command.
   command was:
   #{command.utf8_inspect}
   output we attempted to parse:
   #{output}
-      ERRMSG
+      EOS
     end
     xml
   rescue Plist::ParseError => e
-    raise Hbc::CaskError, <<-ERRMSG
+    raise Hbc::CaskError, <<-EOS
 Error parsing plist output from command.
   command was:
   #{command.utf8_inspect}
@@ -168,6 +168,6 @@ Error parsing plist output from command.
   #{e}
   output we attempted to parse:
   #{output}
-    ERRMSG
+    EOS
   end
 end