Merge pull request #1585 from jawshooah/ruby-19-hash-syntax

Use Ruby 1.9 hash syntax in casks where possible
9 years ago · b0fe932725
181 changed files with 866 additions and 866 deletions
--- a/Casks/1password-beta.rb
+++ b/Casks/1password-beta.rb
@ -9,10 +9,10 @@ cask '1password-beta' do

  app "1Password #{version.to_i}.app"

-  zap :delete => [
-                   '~/Library/Application Scripts/2BUA8C4S2C.com.agilebits.onepassword-osx-helper',
-                   '~/Library/Containers/2BUA8C4S2C.com.agilebits.onepassword-osx-helper',
-                   '~/Library/Containers/com.agilebits.onepassword-osx',
-                   '~/Library/Group Containers/2BUA8C4S2C.com.agilebits',
-                 ]
+  zap delete: [
+                '~/Library/Application Scripts/2BUA8C4S2C.com.agilebits.onepassword-osx-helper',
+                '~/Library/Containers/2BUA8C4S2C.com.agilebits.onepassword-osx-helper',
+                '~/Library/Containers/com.agilebits.onepassword-osx',
+                '~/Library/Group Containers/2BUA8C4S2C.com.agilebits',
+              ]
 end
--- a/Casks/ableton-live-standard.rb
+++ b/Casks/ableton-live-standard.rb
@ -15,7 +15,7 @@ cask 'ableton-live-standard' do

  app "Ableton Live #{version.to_i} Standard.app"

-  zap :delete => '~/Library/*/*[Aa]bleton*',
-      :rmdir  => '~/Music/Ableton/Factory Packs'
+  zap delete: '~/Library/*/*[Aa]bleton*',
+      rmdir:  '~/Music/Ableton/Factory Packs'
  #:trash => '~/Music/Ableton/User Library'
 end
--- a/Casks/ableton-live-suite.rb
+++ b/Casks/ableton-live-suite.rb
@ -15,7 +15,7 @@ cask 'ableton-live-suite' do

  app "Ableton Live #{version[0]} Suite.app"

-  zap :delete => '~/Library/*/*[Aa]bleton*',
-      :rmdir  => '~/Music/Ableton/Factory Packs'
+  zap delete: '~/Library/*/*[Aa]bleton*',
+      rmdir:  '~/Music/Ableton/Factory Packs'
  #:trash => '~/Music/Ableton/User Library'
 end
--- a/Casks/adium-beta.rb
+++ b/Casks/adium-beta.rb
@ -9,9 +9,9 @@ cask 'adium-beta' do

  app 'Adium.app'

-  zap :delete => [
-                   '~/Library/Caches/Adium',
-                   '~/Library/Caches/com.adiumX.adiumX',
-                   '~/Library/Preferences/com.adiumX.adiumX.plist',
-                 ]
+  zap delete: [
+                '~/Library/Caches/Adium',
+                '~/Library/Caches/com.adiumX.adiumX',
+                '~/Library/Preferences/com.adiumX.adiumX.plist',
+              ]
 end
--- a/Casks/adobe-design-standard-cs6-de.rb
+++ b/Casks/adobe-design-standard-cs6-de.rb
@ -9,8 +9,8 @@ cask 'adobe-design-standard-cs6-de' do
  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html

  url 'http://trials2.adobe.com/AdobeProducts/DSGN/CS6/osx10/DesignStandard_CS6_LS4.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe CS6 Design Standard' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-design-standard-cs6-es.rb
+++ b/Casks/adobe-design-standard-cs6-es.rb
@ -9,8 +9,8 @@ cask 'adobe-design-standard-cs6-es' do
  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html

  url 'http://trials2.adobe.com/AdobeProducts/DSGN/CS6/osx10/DesignStandard_CS6_LS4.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe CS6 Design Standard' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-design-standard-cs6-fr.rb
+++ b/Casks/adobe-design-standard-cs6-fr.rb
@ -9,8 +9,8 @@ cask 'adobe-design-standard-cs6-fr' do
  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html

  url 'http://trials2.adobe.com/AdobeProducts/DSGN/CS6/osx10/DesignStandard_CS6_LS4.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe CS6 Design Standard' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-design-standard-cs6-it.rb
+++ b/Casks/adobe-design-standard-cs6-it.rb
@ -9,8 +9,8 @@ cask 'adobe-design-standard-cs6-it' do
  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html

  url 'http://trials2.adobe.com/AdobeProducts/DSGN/CS6/osx10/DesignStandard_CS6_LS4.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe CS6 Design Standard' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-design-standard-cs6-ja.rb
+++ b/Casks/adobe-design-standard-cs6-ja.rb
@ -9,8 +9,8 @@ cask 'adobe-design-standard-cs6-ja' do
  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html

  url 'http://trials2.adobe.com/AdobeProducts/DSGN/CS6/osx10/DesignStandard_CS6_LS16.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe CS6 Design Standard' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-design-standard-cs6-nl.rb
+++ b/Casks/adobe-design-standard-cs6-nl.rb
@ -9,8 +9,8 @@ cask 'adobe-design-standard-cs6-nl' do
  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html

  url 'http://trials2.adobe.com/AdobeProducts/DSGN/CS6/osx10/DesignStandard_CS6_LS4.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe CS6 Design Standard' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-design-standard-cs6.rb
+++ b/Casks/adobe-design-standard-cs6.rb
@ -9,8 +9,8 @@ cask 'adobe-design-standard-cs6' do
  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html

  url 'http://trials2.adobe.com/AdobeProducts/DSGN/CS6/osx10/DesignStandard_CS6_LS16.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe CS6 Design Standard' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-design-web-premium-cs6-de.rb
+++ b/Casks/adobe-design-web-premium-cs6-de.rb
@ -9,8 +9,8 @@ cask 'adobe-design-web-premium-cs6-de' do
  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html

  url 'http://trials2.adobe.com/AdobeProducts/DSST/CS6/osx10/DesignWebPremium_CS6_LS4.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe CS6 Design and Web Premium' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-design-web-premium-cs6-es.rb
+++ b/Casks/adobe-design-web-premium-cs6-es.rb
@ -9,8 +9,8 @@ cask 'adobe-design-web-premium-cs6-es' do
  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html

  url 'http://trials2.adobe.com/AdobeProducts/DSST/CS6/osx10/DesignWebPremium_CS6_LS4.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe CS6 Design and Web Premium' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-design-web-premium-cs6-fr.rb
+++ b/Casks/adobe-design-web-premium-cs6-fr.rb
@ -9,8 +9,8 @@ cask 'adobe-design-web-premium-cs6-fr' do
  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html

  url 'http://trials2.adobe.com/AdobeProducts/DSST/CS6/osx10/DesignWebPremium_CS6_LS4.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe CS6 Design and Web Premium' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-design-web-premium-cs6-it.rb
+++ b/Casks/adobe-design-web-premium-cs6-it.rb
@ -9,8 +9,8 @@ cask 'adobe-design-web-premium-cs6-it' do
  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html

  url 'http://trials2.adobe.com/AdobeProducts/DSST/CS6/osx10/DesignWebPremium_CS6_LS4.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe CS6 Design and Web Premium' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-design-web-premium-cs6-ja.rb
+++ b/Casks/adobe-design-web-premium-cs6-ja.rb
@ -9,8 +9,8 @@ cask 'adobe-design-web-premium-cs6-ja' do
  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html

  url 'http://trials2.adobe.com/AdobeProducts/DSST/CS6/osx10/DesignWebPremium_CS6_LS16.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe CS6 Design and Web Premium' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-design-web-premium-cs6-nl.rb
+++ b/Casks/adobe-design-web-premium-cs6-nl.rb
@ -9,8 +9,8 @@ cask 'adobe-design-web-premium-cs6-nl' do
  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html

  url 'http://trials2.adobe.com/AdobeProducts/DSST/CS6/osx10/DesignWebPremium_CS6_LS4.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe CS6 Design and Web Premium' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-design-web-premium-cs6.rb
+++ b/Casks/adobe-design-web-premium-cs6.rb
@ -9,8 +9,8 @@ cask 'adobe-design-web-premium-cs6' do
  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html

  url 'http://trials2.adobe.com/AdobeProducts/DSST/CS6/osx10/DesignWebPremium_CS6_LS16.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe CS6 Design and Web Premium' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-digital-editions2.rb
+++ b/Casks/adobe-digital-editions2.rb
@ -7,8 +7,8 @@ cask 'adobe-digital-editions2' do
  homepage 'https://www.adobe.com/solutions/ebook/digital-editions.html'
  license :gratis

-  pkg 'Digital Editions 2.0 Installer.pkg', :allow_untrusted => true
+  pkg 'Digital Editions 2.0 Installer.pkg', allow_untrusted: true

-  uninstall :pkgutil => 'com.adobe.adobedigitaleditions.app',
-            :delete  => '/Applications/Adobe Digital Editions.app'
+  uninstall pkgutil: 'com.adobe.adobedigitaleditions.app',
+            delete:  '/Applications/Adobe Digital Editions.app'
 end
--- a/Casks/adobe-illustrator-cc-de.rb
+++ b/Casks/adobe-illustrator-cc-de.rb
@ -3,13 +3,13 @@ cask 'adobe-illustrator-cc-de' do
  sha256 :no_check

  url 'http://trials3.adobe.com/AdobeProducts/ILST/19/osx10-64/Illustrator_19_LS20.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe Illustrator CC 2015'
  homepage 'https://www.adobe.com/products/illustrator.html'
  license :commercial

-  conflicts_with :cask => 'adobe-illustrator-cc'
+  conflicts_with cask: 'adobe-illustrator-cc'

  preflight do
    deployment_xml = "#{staged_path}/Adobe Illustrator CC 2015/Deployment/deployment.xml"
@ -26,5 +26,5 @@ cask 'adobe-illustrator-cc-de' do
    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe Illustrator CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe\ Illustrator\ CC\ 2015/Deployment/uninstall.xml"
  end

-  uninstall :rmdir => '/Applications/Utilities/Adobe Installers'
+  uninstall rmdir: '/Applications/Utilities/Adobe Installers'
 end
--- a/Casks/adobe-illustrator-cc-es.rb
+++ b/Casks/adobe-illustrator-cc-es.rb
@ -3,13 +3,13 @@ cask 'adobe-illustrator-cc-es' do
  sha256 :no_check

  url 'http://trials3.adobe.com/AdobeProducts/ILST/19/osx10-64/Illustrator_19_LS20.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe Illustrator CC 2015'
  homepage 'https://www.adobe.com/products/illustrator.html'
  license :commercial

-  conflicts_with :cask => 'adobe-illustrator-cc'
+  conflicts_with cask: 'adobe-illustrator-cc'

  preflight do
    deployment_xml = "#{staged_path}/Adobe Illustrator CC 2015/Deployment/deployment.xml"
@ -26,5 +26,5 @@ cask 'adobe-illustrator-cc-es' do
    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe Illustrator CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe\ Illustrator\ CC\ 2015/Deployment/uninstall.xml"
  end

-  uninstall :rmdir => '/Applications/Utilities/Adobe Installers'
+  uninstall rmdir: '/Applications/Utilities/Adobe Installers'
 end
--- a/Casks/adobe-illustrator-cc-fr.rb
+++ b/Casks/adobe-illustrator-cc-fr.rb
@ -3,13 +3,13 @@ cask 'adobe-illustrator-cc-fr' do
  sha256 :no_check

  url 'http://trials3.adobe.com/AdobeProducts/ILST/19/osx10-64/Illustrator_19_LS20.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe Illustrator CC 2015'
  homepage 'https://www.adobe.com/products/illustrator.html'
  license :commercial

-  conflicts_with :cask => 'adobe-illustrator-cc'
+  conflicts_with cask: 'adobe-illustrator-cc'

  preflight do
    deployment_xml = "#{staged_path}/Adobe Illustrator CC 2015/Deployment/deployment.xml"
@ -26,5 +26,5 @@ cask 'adobe-illustrator-cc-fr' do
    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe Illustrator CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe\ Illustrator\ CC\ 2015/Deployment/uninstall.xml"
  end

-  uninstall :rmdir => '/Applications/Utilities/Adobe Installers'
+  uninstall rmdir: '/Applications/Utilities/Adobe Installers'
 end
--- a/Casks/adobe-illustrator-cc-it.rb
+++ b/Casks/adobe-illustrator-cc-it.rb
@ -3,13 +3,13 @@ cask 'adobe-illustrator-cc-it' do
  sha256 :no_check

  url 'http://trials3.adobe.com/AdobeProducts/ILST/19/osx10-64/Illustrator_19_LS20.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe Illustrator CC 2015'
  homepage 'https://www.adobe.com/products/illustrator.html'
  license :commercial

-  conflicts_with :cask => 'adobe-illustrator-cc'
+  conflicts_with cask: 'adobe-illustrator-cc'

  preflight do
    deployment_xml = "#{staged_path}/Adobe Illustrator CC 2015/Deployment/deployment.xml"
@ -26,5 +26,5 @@ cask 'adobe-illustrator-cc-it' do
    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe Illustrator CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe\ Illustrator\ CC\ 2015/Deployment/uninstall.xml"
  end

-  uninstall :rmdir => '/Applications/Utilities/Adobe Installers'
+  uninstall rmdir: '/Applications/Utilities/Adobe Installers'
 end
--- a/Casks/adobe-illustrator-cc-ja.rb
+++ b/Casks/adobe-illustrator-cc-ja.rb
@ -3,13 +3,13 @@ cask 'adobe-illustrator-cc-ja' do
  sha256 :no_check

  url 'http://trials3.adobe.com/AdobeProducts/ILST/19/osx10-64/Illustrator_19_LS20.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe Illustrator CC 2015'
  homepage 'https://www.adobe.com/products/illustrator.html'
  license :commercial

-  conflicts_with :cask => 'adobe-illustrator-cc'
+  conflicts_with cask: 'adobe-illustrator-cc'

  preflight do
    deployment_xml = "#{staged_path}/Adobe Illustrator CC 2015/Deployment/deployment.xml"
@ -26,5 +26,5 @@ cask 'adobe-illustrator-cc-ja' do
    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe Illustrator CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe\ Illustrator\ CC\ 2015/Deployment/uninstall.xml"
  end

-  uninstall :rmdir => '/Applications/Utilities/Adobe Installers'
+  uninstall rmdir: '/Applications/Utilities/Adobe Installers'
 end
--- a/Casks/adobe-illustrator-cc-nl.rb
+++ b/Casks/adobe-illustrator-cc-nl.rb
@ -3,13 +3,13 @@ cask 'adobe-illustrator-cc-nl' do
  sha256 :no_check

  url 'http://trials3.adobe.com/AdobeProducts/ILST/19/osx10-64/Illustrator_19_LS20.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe Illustrator CC 2015'
  homepage 'https://www.adobe.com/products/illustrator.html'
  license :commercial

-  conflicts_with :cask => 'adobe-illustrator-cc'
+  conflicts_with cask: 'adobe-illustrator-cc'

  preflight do
    deployment_xml = "#{staged_path}/Adobe Illustrator CC 2015/Deployment/deployment.xml"
@ -26,5 +26,5 @@ cask 'adobe-illustrator-cc-nl' do
    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe Illustrator CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe\ Illustrator\ CC\ 2015/Deployment/uninstall.xml"
  end

-  uninstall :rmdir => '/Applications/Utilities/Adobe Installers'
+  uninstall rmdir: '/Applications/Utilities/Adobe Installers'
 end
--- a/Casks/adobe-indesign-cc-de.rb
+++ b/Casks/adobe-indesign-cc-de.rb
@ -3,13 +3,13 @@ cask 'adobe-indesign-cc-de' do
  sha256 :no_check

  url 'http://trials3.adobe.com/AdobeProducts/IDSN/11/osx10/InDesign_11_LS20.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe InDesign CC 2015'
  homepage 'https://www.adobe.com/products/indesign.html'
  license :commercial

-  conflicts_with :cask => 'adobe-indesign-cc'
+  conflicts_with cask: 'adobe-indesign-cc'

  preflight do
    deployment_xml = "#{staged_path}/Adobe InDesign CC 2015/deploy/install.xml"
@ -26,5 +26,5 @@ cask 'adobe-indesign-cc-de' do
    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe InDesign CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe\ InDesign\ CC\ 2015/deploy/remove.xml"
  end

-  uninstall :rmdir => '/Applications/Utilities/Adobe Installers'
+  uninstall rmdir: '/Applications/Utilities/Adobe Installers'
 end
--- a/Casks/adobe-indesign-cc-es.rb
+++ b/Casks/adobe-indesign-cc-es.rb
@ -3,13 +3,13 @@ cask 'adobe-indesign-cc-es' do
  sha256 :no_check

  url 'http://trials3.adobe.com/AdobeProducts/IDSN/11/osx10/InDesign_11_LS20.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe InDesign CC 2015'
  homepage 'https://www.adobe.com/products/indesign.html'
  license :commercial

-  conflicts_with :cask => 'adobe-indesign-cc'
+  conflicts_with cask: 'adobe-indesign-cc'

  preflight do
    deployment_xml = "#{staged_path}/Adobe InDesign CC 2015/deploy/install.xml"
@ -26,5 +26,5 @@ cask 'adobe-indesign-cc-es' do
    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe InDesign CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe\ InDesign\ CC\ 2015/deploy/remove.xml"
  end

-  uninstall :rmdir => '/Applications/Utilities/Adobe Installers'
+  uninstall rmdir: '/Applications/Utilities/Adobe Installers'
 end
--- a/Casks/adobe-indesign-cc-fr.rb
+++ b/Casks/adobe-indesign-cc-fr.rb
@ -3,13 +3,13 @@ cask 'adobe-indesign-cc-fr' do
  sha256 :no_check

  url 'http://trials3.adobe.com/AdobeProducts/IDSN/11/osx10/InDesign_11_LS20.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe InDesign CC 2015'
  homepage 'https://www.adobe.com/products/indesign.html'
  license :commercial

-  conflicts_with :cask => 'adobe-indesign-cc'
+  conflicts_with cask: 'adobe-indesign-cc'

  preflight do
    deployment_xml = "#{staged_path}/Adobe InDesign CC 2015/deploy/install.xml"
@ -26,5 +26,5 @@ cask 'adobe-indesign-cc-fr' do
    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe InDesign CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe\ InDesign\ CC\ 2015/deploy/remove.xml"
  end

-  uninstall :rmdir => '/Applications/Utilities/Adobe Installers'
+  uninstall rmdir: '/Applications/Utilities/Adobe Installers'
 end
--- a/Casks/adobe-indesign-cc-it.rb
+++ b/Casks/adobe-indesign-cc-it.rb
@ -3,13 +3,13 @@ cask 'adobe-indesign-cc-it' do
  sha256 :no_check

  url 'http://trials3.adobe.com/AdobeProducts/IDSN/11/osx10/InDesign_11_LS20.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe InDesign CC 2015'
  homepage 'https://www.adobe.com/products/indesign.html'
  license :commercial

-  conflicts_with :cask => 'adobe-indesign-cc'
+  conflicts_with cask: 'adobe-indesign-cc'

  preflight do
    deployment_xml = "#{staged_path}/Adobe InDesign CC 2015/deploy/install.xml"
@ -26,5 +26,5 @@ cask 'adobe-indesign-cc-it' do
    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe InDesign CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe\ InDesign\ CC\ 2015/deploy/remove.xml"
  end

-  uninstall :rmdir => '/Applications/Utilities/Adobe Installers'
+  uninstall rmdir: '/Applications/Utilities/Adobe Installers'
 end
--- a/Casks/adobe-indesign-cc-ja.rb
+++ b/Casks/adobe-indesign-cc-ja.rb
@ -3,13 +3,13 @@ cask 'adobe-indesign-cc-ja' do
  sha256 :no_check

  url 'http://trials3.adobe.com/AdobeProducts/IDSN/11/osx10/InDesign_11_LS20.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe InDesign CC 2015'
  homepage 'https://www.adobe.com/products/indesign.html'
  license :commercial

-  conflicts_with :cask => 'adobe-indesign-cc'
+  conflicts_with cask: 'adobe-indesign-cc'

  preflight do
    deployment_xml = "#{staged_path}/Adobe InDesign CC 2015/deploy/install.xml"
@ -26,5 +26,5 @@ cask 'adobe-indesign-cc-ja' do
    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe InDesign CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe\ InDesign\ CC\ 2015/deploy/remove.xml"
  end

-  uninstall :rmdir => '/Applications/Utilities/Adobe Installers'
+  uninstall rmdir: '/Applications/Utilities/Adobe Installers'
 end
--- a/Casks/adobe-indesign-cc-nl.rb
+++ b/Casks/adobe-indesign-cc-nl.rb
@ -3,13 +3,13 @@ cask 'adobe-indesign-cc-nl' do
  sha256 :no_check

  url 'http://trials3.adobe.com/AdobeProducts/IDSN/11/osx10/InDesign_11_LS20.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe InDesign CC 2015'
  homepage 'https://www.adobe.com/products/indesign.html'
  license :commercial

-  conflicts_with :cask => 'adobe-indesign-cc'
+  conflicts_with cask: 'adobe-indesign-cc'

  preflight do
    deployment_xml = "#{staged_path}/Adobe InDesign CC 2015/deploy/install.xml"
@ -26,5 +26,5 @@ cask 'adobe-indesign-cc-nl' do
    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe InDesign CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe\ InDesign\ CC\ 2015/deploy/remove.xml"
  end

-  uninstall :rmdir => '/Applications/Utilities/Adobe Installers'
+  uninstall rmdir: '/Applications/Utilities/Adobe Installers'
 end
--- a/Casks/adobe-master-collection-cs6-de.rb
+++ b/Casks/adobe-master-collection-cs6-de.rb
@ -9,8 +9,8 @@ cask 'adobe-master-collection-cs6-de' do
  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html

  url 'http://trials2.adobe.com/AdobeProducts/STAM/CS6/osx10/MasterCollection_CS6_LS4.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe CS6 Master Collection' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-master-collection-cs6-es.rb
+++ b/Casks/adobe-master-collection-cs6-es.rb
@ -9,8 +9,8 @@ cask 'adobe-master-collection-cs6-es' do
  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html

  url 'http://trials2.adobe.com/AdobeProducts/STAM/CS6/osx10/MasterCollection_CS6_LS4.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe CS6 Master Collection' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-master-collection-cs6-fr.rb
+++ b/Casks/adobe-master-collection-cs6-fr.rb
@ -9,8 +9,8 @@ cask 'adobe-master-collection-cs6-fr' do
  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html

  url 'http://trials2.adobe.com/AdobeProducts/STAM/CS6/osx10/MasterCollection_CS6_LS4.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe CS6 Master Collection' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-master-collection-cs6-it.rb
+++ b/Casks/adobe-master-collection-cs6-it.rb
@ -9,8 +9,8 @@ cask 'adobe-master-collection-cs6-it' do
  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html

  url 'http://trials2.adobe.com/AdobeProducts/STAM/CS6/osx10/MasterCollection_CS6_LS4.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe CS6 Master Collection' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-master-collection-cs6-ja.rb
+++ b/Casks/adobe-master-collection-cs6-ja.rb
@ -9,8 +9,8 @@ cask 'adobe-master-collection-cs6-ja' do
  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html

  url 'http://trials2.adobe.com/AdobeProducts/STAM/CS6/osx10/MasterCollection_CS6_LS16.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe CS6 Master Collection' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-master-collection-cs6-nl.rb
+++ b/Casks/adobe-master-collection-cs6-nl.rb
@ -9,8 +9,8 @@ cask 'adobe-master-collection-cs6-nl' do
  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html

  url 'http://trials2.adobe.com/AdobeProducts/STAM/CS6/osx10/MasterCollection_CS6_LS4.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe CS6 Master Collection' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-master-collection-cs6.rb
+++ b/Casks/adobe-master-collection-cs6.rb
@ -9,8 +9,8 @@ cask 'adobe-master-collection-cs6' do
  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html

  url 'http://trials2.adobe.com/AdobeProducts/STAM/CS6/osx10/MasterCollection_CS6_LS16.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe CS6 Master Collection' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-photoshop-cc-de.rb
+++ b/Casks/adobe-photoshop-cc-de.rb
@ -3,13 +3,13 @@ cask 'adobe-photoshop-cc-de' do
  sha256 :no_check

  url 'http://trials3.adobe.com/AdobeProducts/PHSP/16/osx10/Photoshop_16_LS20.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe Photoshop CC 2015'
  homepage 'https://www.adobe.com/products/photoshop.html'
  license :commercial

-  conflicts_with :cask => 'adobe-photoshop-cc'
+  conflicts_with cask: 'adobe-photoshop-cc'

  preflight do
    file = File.open "#{staged_path}/uninstall.xml", 'w'
@ -34,5 +34,5 @@ cask 'adobe-photoshop-cc-de' do
    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe Photoshop CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/uninstall.xml"
  end

-  uninstall :rmdir => '/Applications/Utilities/Adobe Installers'
+  uninstall rmdir: '/Applications/Utilities/Adobe Installers'
 end
--- a/Casks/adobe-photoshop-cc-es.rb
+++ b/Casks/adobe-photoshop-cc-es.rb
@ -3,13 +3,13 @@ cask 'adobe-photoshop-cc-es' do
  sha256 :no_check

  url 'http://trials3.adobe.com/AdobeProducts/PHSP/16/osx10/Photoshop_16_LS20.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe Photoshop CC 2015'
  homepage 'https://www.adobe.com/products/photoshop.html'
  license :commercial

-  conflicts_with :cask => 'adobe-photoshop-cc'
+  conflicts_with cask: 'adobe-photoshop-cc'

  preflight do
    file = File.open "#{staged_path}/uninstall.xml", 'w'
@ -34,5 +34,5 @@ cask 'adobe-photoshop-cc-es' do
    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe Photoshop CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/uninstall.xml"
  end

-  uninstall :rmdir => '/Applications/Utilities/Adobe Installers'
+  uninstall rmdir: '/Applications/Utilities/Adobe Installers'
 end
--- a/Casks/adobe-photoshop-cc-fr.rb
+++ b/Casks/adobe-photoshop-cc-fr.rb
@ -3,13 +3,13 @@ cask 'adobe-photoshop-cc-fr' do
  sha256 :no_check

  url 'http://trials3.adobe.com/AdobeProducts/PHSP/16/osx10/Photoshop_16_LS20.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe Photoshop CC 2015'
  homepage 'https://www.adobe.com/products/photoshop.html'
  license :commercial

-  conflicts_with :cask => 'adobe-photoshop-cc'
+  conflicts_with cask: 'adobe-photoshop-cc'

  preflight do
    file = File.open "#{staged_path}/uninstall.xml", 'w'
@ -34,5 +34,5 @@ cask 'adobe-photoshop-cc-fr' do
    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe Photoshop CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/uninstall.xml"
  end

-  uninstall :rmdir => '/Applications/Utilities/Adobe Installers'
+  uninstall rmdir: '/Applications/Utilities/Adobe Installers'
 end
--- a/Casks/adobe-photoshop-cc-it.rb
+++ b/Casks/adobe-photoshop-cc-it.rb
@ -3,13 +3,13 @@ cask 'adobe-photoshop-cc-it' do
  sha256 :no_check

  url 'http://trials3.adobe.com/AdobeProducts/PHSP/16/osx10/Photoshop_16_LS20.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe Photoshop CC 2015'
  homepage 'https://www.adobe.com/products/photoshop.html'
  license :commercial

-  conflicts_with :cask => 'adobe-photoshop-cc'
+  conflicts_with cask: 'adobe-photoshop-cc'

  preflight do
    file = File.open "#{staged_path}/uninstall.xml", 'w'
@ -34,5 +34,5 @@ cask 'adobe-photoshop-cc-it' do
    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe Photoshop CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/uninstall.xml"
  end

-  uninstall :rmdir => '/Applications/Utilities/Adobe Installers'
+  uninstall rmdir: '/Applications/Utilities/Adobe Installers'
 end
--- a/Casks/adobe-photoshop-cc-ja.rb
+++ b/Casks/adobe-photoshop-cc-ja.rb
@ -3,13 +3,13 @@ cask 'adobe-photoshop-cc-ja' do
  sha256 :no_check

  url 'http://trials3.adobe.com/AdobeProducts/PHSP/16/osx10/Photoshop_16_LS20.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe Photoshop CC 2015'
  homepage 'https://www.adobe.com/products/photoshop.html'
  license :commercial

-  conflicts_with :cask => 'adobe-photoshop-cc'
+  conflicts_with cask: 'adobe-photoshop-cc'

  preflight do
    file = File.open "#{staged_path}/uninstall.xml", 'w'
@ -34,5 +34,5 @@ cask 'adobe-photoshop-cc-ja' do
    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe Photoshop CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/uninstall.xml"
  end

-  uninstall :rmdir => '/Applications/Utilities/Adobe Installers'
+  uninstall rmdir: '/Applications/Utilities/Adobe Installers'
 end
--- a/Casks/adobe-photoshop-cc-nl.rb
+++ b/Casks/adobe-photoshop-cc-nl.rb
@ -3,13 +3,13 @@ cask 'adobe-photoshop-cc-nl' do
  sha256 :no_check

  url 'http://trials3.adobe.com/AdobeProducts/PHSP/16/osx10/Photoshop_16_LS20.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe Photoshop CC 2015'
  homepage 'https://www.adobe.com/products/photoshop.html'
  license :commercial

-  conflicts_with :cask => 'adobe-photoshop-cc'
+  conflicts_with cask: 'adobe-photoshop-cc'

  preflight do
    file = File.open "#{staged_path}/uninstall.xml", 'w'
@ -34,5 +34,5 @@ cask 'adobe-photoshop-cc-nl' do
    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe Photoshop CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/uninstall.xml"
  end

-  uninstall :rmdir => '/Applications/Utilities/Adobe Installers'
+  uninstall rmdir: '/Applications/Utilities/Adobe Installers'
 end
--- a/Casks/adobe-photoshop-cs5.rb
+++ b/Casks/adobe-photoshop-cs5.rb
@ -9,8 +9,8 @@ cask 'adobe-photoshop-cs5' do
  # https://helpx.adobe.com/creative-suite/kb/cs5-product-downloads.html

  url 'http://trials2.adobe.com/dlm/AdobeProducts/PHSP/12/osx10/Photoshop_12_LS1.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe Photoshop CS5' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-photoshop-lightroom571.rb
+++ b/Casks/adobe-photoshop-lightroom571.rb
@ -9,12 +9,12 @@ cask 'adobe-photoshop-lightroom571' do

  pkg "Adobe Photoshop Lightroom #{version.to_i}.pkg"

-  uninstall :pkgutil => "com.adobe.Lightroom#{version.to_i}",
-            :quit    => "com.adobe.Lightroom#{version.to_i}",
-            :delete  => "/Applications/Adobe Photoshop Lightroom #{version.to_i}.app"
+  uninstall pkgutil: "com.adobe.Lightroom#{version.to_i}",
+            quit:    "com.adobe.Lightroom#{version.to_i}",
+            delete:  "/Applications/Adobe Photoshop Lightroom #{version.to_i}.app"

-  zap       :delete => [
-                         '~/Library/Application Support/Adobe/Lightroom',
-                         "~/Library/Preferences/com.adobe.Lightroom#{version.to_i}.plist",
-                       ]
+  zap       delete: [
+                      '~/Library/Application Support/Adobe/Lightroom',
+                      "~/Library/Preferences/com.adobe.Lightroom#{version.to_i}.plist",
+                    ]
 end
--- a/Casks/adobe-photoshop-lightroom600.rb
+++ b/Casks/adobe-photoshop-lightroom600.rb
@ -3,8 +3,8 @@ cask 'adobe-photoshop-lightroom600' do
  sha256 '5c36e5fa76b8676144c4bba9790fe4c597daf350b2195a2088346b097f46a95f'

  url "http://trials3.adobe.com/AdobeProducts/LTRM/#{version.to_i}/osx10/Lightroom_#{version.to_i}_LS11.dmg",
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe Photoshop Lightroom'
  homepage 'https://www.adobe.com/products/photoshop-lightroom.html'
  license :commercial
@ -23,12 +23,12 @@ cask 'adobe-photoshop-lightroom600' do
    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/deploy/AdobeLightroom6.remove.xml"
  end

-  uninstall :delete => '/Applications/Adobe Lightroom/Adobe Lightroom.app'
+  uninstall delete: '/Applications/Adobe Lightroom/Adobe Lightroom.app'

-  zap       :delete => [
-                         '~/Library/Application Support/Adobe/Lightroom',
-                         "~/Library/Preferences/com.adobe.Lightroom#{version.to_i}.plist",
-                       ]
+  zap       delete: [
+                      '~/Library/Application Support/Adobe/Lightroom',
+                      "~/Library/Preferences/com.adobe.Lightroom#{version.to_i}.plist",
+                    ]

  caveats 'Installation or Uninstallation may fail with Exit Code 19 (Conflicting Processes running) if Browsers, Safari Notification Service or SIMBL Services are running or Adobe Creative Cloud or any other Adobe Products are already installed. See Logs in /Library/Logs/Adobe/Installers if Installation or Uninstallation fails, to identify the conflicting processes.'
 end
--- a/Casks/adobe-production-premium-cs6-de.rb
+++ b/Casks/adobe-production-premium-cs6-de.rb
@ -9,8 +9,8 @@ cask 'adobe-production-premium-cs6-de' do
  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html

  url 'http://trials2.adobe.com/AdobeProducts/STVD/CS6/osx10/ProductionPremium_CS6_LS7.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe CS6 Production Premium' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-production-premium-cs6-es.rb
+++ b/Casks/adobe-production-premium-cs6-es.rb
@ -9,8 +9,8 @@ cask 'adobe-production-premium-cs6-es' do
  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html

  url 'http://trials2.adobe.com/AdobeProducts/STVD/CS6/osx10/ProductionPremium_CS6_LS7.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe CS6 Production Premium' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-production-premium-cs6-fr.rb
+++ b/Casks/adobe-production-premium-cs6-fr.rb
@ -9,8 +9,8 @@ cask 'adobe-production-premium-cs6-fr' do
  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html

  url 'http://trials2.adobe.com/AdobeProducts/STVD/CS6/osx10/ProductionPremium_CS6_LS7.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe CS6 Production Premium' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-production-premium-cs6-it.rb
+++ b/Casks/adobe-production-premium-cs6-it.rb
@ -9,8 +9,8 @@ cask 'adobe-production-premium-cs6-it' do
  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html

  url 'http://trials2.adobe.com/AdobeProducts/STVD/CS6/osx10/ProductionPremium_CS6_LS7.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe CS6 Production Premium' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-production-premium-cs6-ja.rb
+++ b/Casks/adobe-production-premium-cs6-ja.rb
@ -9,8 +9,8 @@ cask 'adobe-production-premium-cs6-ja' do
  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html

  url 'http://trials2.adobe.com/AdobeProducts/STVD/CS6/osx10/ProductionPremium_CS6_LS7.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe CS6 Production Premium' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-production-premium-cs6.rb
+++ b/Casks/adobe-production-premium-cs6.rb
@ -9,8 +9,8 @@ cask 'adobe-production-premium-cs6' do
  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html

  url 'http://trials2.adobe.com/AdobeProducts/STVD/CS6/osx10/ProductionPremium_CS6_LS7.dmg',
-      :user_agent => :fake,
-      :cookies    => { 'MM_TRIALS' => '1234' }
+      user_agent: :fake,
+      cookies:    { 'MM_TRIALS' => '1234' }
  name 'Adobe CS6 Production Premium' # name must exactly match directory in dmg!
  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
  license :commercial
--- a/Casks/adobe-reader-de.rb
+++ b/Casks/adobe-reader-de.rb
@ -9,11 +9,11 @@ cask 'adobe-reader-de' do

  pkg 'Adobe Reader XI Installer.pkg'

-  uninstall :pkgutil => "com.adobe.acrobat.reader.#{version.gsub('.', '')}.*",
-            :delete  => '/Applications/Adobe Reader.app'
+  uninstall pkgutil: "com.adobe.acrobat.reader.#{version.gsub('.', '')}.*",
+            delete:  '/Applications/Adobe Reader.app'

-  zap       :delete => [
-                         "~/Library/Application Support/Adobe/Acrobat/#{version.sub(%r{(\d+)\.(\d+).*}, '\1.\2')}",
-                         '~/Library/Preferences/com.adobe.Reader.plist',
-                       ]
+  zap       delete: [
+                      "~/Library/Application Support/Adobe/Acrobat/#{version.sub(%r{(\d+)\.(\d+).*}, '\1.\2')}",
+                      '~/Library/Preferences/com.adobe.Reader.plist',
+                    ]
 end
--- a/Casks/adobe-reader-fr.rb
+++ b/Casks/adobe-reader-fr.rb
@ -9,11 +9,11 @@ cask 'adobe-reader-fr' do

  pkg 'Adobe Reader XI Installer.pkg'

-  uninstall :pkgutil => "com.adobe.acrobat.reader.#{version.gsub('.', '')}.*",
-            :delete  => '/Applications/Adobe Reader.app'
+  uninstall pkgutil: "com.adobe.acrobat.reader.#{version.gsub('.', '')}.*",
+            delete:  '/Applications/Adobe Reader.app'

-  zap       :delete => [
-                         "~/Library/Application Support/Adobe/Acrobat/#{version.sub(%r{(\d+)\.(\d+)\.*}, '\1.\2')}",
-                         '~/Library/Preferences/com.adobe.Reader.plist',
-                       ]
+  zap       delete: [
+                      "~/Library/Application Support/Adobe/Acrobat/#{version.sub(%r{(\d+)\.(\d+)\.*}, '\1.\2')}",
+                      '~/Library/Preferences/com.adobe.Reader.plist',
+                    ]
 end
--- a/Casks/adobe-reader-ja.rb
+++ b/Casks/adobe-reader-ja.rb
@ -11,6 +11,6 @@ cask 'adobe-reader-ja' do

  pkg 'Adobe Reader XI Installer.pkg'

-  uninstall :pkgutil => "com.adobe.acrobat.reader.#{major_version}.*",
-            :delete  => '/Applications/Adobe Reader.app'
+  uninstall pkgutil: "com.adobe.acrobat.reader.#{major_version}.*",
+            delete:  '/Applications/Adobe Reader.app'
 end
--- a/Casks/adobe-reader-pl.rb
+++ b/Casks/adobe-reader-pl.rb
@ -9,12 +9,12 @@ cask 'adobe-reader-pl' do

  pkg 'Adobe Reader XI Installer.pkg'

-  uninstall :pkgutil => "com.adobe.acrobat.reader.#{version.gsub('.', '')}.*",
-            :delete  => '/Applications/Adobe Reader.app'
+  uninstall pkgutil: "com.adobe.acrobat.reader.#{version.gsub('.', '')}.*",
+            delete:  '/Applications/Adobe Reader.app'

-  zap       :delete => [
-                         "~/Library/Application Support/Adobe/Acrobat/#{version.sub(%r{(\d+)\.(\d+).*}, '\1.\2')}",
-                         '~/Library/Preferences/com.adobe.Reader.plist',
-                         '~/Library/Caches/com.adobe.Reader',
-                       ]
+  zap       delete: [
+                      "~/Library/Application Support/Adobe/Acrobat/#{version.sub(%r{(\d+)\.(\d+).*}, '\1.\2')}",
+                      '~/Library/Preferences/com.adobe.Reader.plist',
+                      '~/Library/Caches/com.adobe.Reader',
+                    ]
 end
--- a/Casks/adobe-reader-pt-br.rb
+++ b/Casks/adobe-reader-pt-br.rb
@ -9,11 +9,11 @@ cask 'adobe-reader-pt-br' do

  pkg 'Adobe Reader XI Installer.pkg'

-  uninstall :pkgutil => "com.adobe.acrobat.reader.#{version.gsub('.', '')}.*",
-            :delete  => '/Applications/Adobe Reader.app'
+  uninstall pkgutil: "com.adobe.acrobat.reader.#{version.gsub('.', '')}.*",
+            delete:  '/Applications/Adobe Reader.app'

-  zap       :delete => [
-                         "~/Library/Application Support/Adobe/Acrobat/#{version.sub(%r{(\d+)\.(\d+)\.*}, '\1.\2')}",
-                         '~/Library/Preferences/com.adobe.Reader.plist',
-                       ]
+  zap       delete: [
+                      "~/Library/Application Support/Adobe/Acrobat/#{version.sub(%r{(\d+)\.(\d+)\.*}, '\1.\2')}",
+                      '~/Library/Preferences/com.adobe.Reader.plist',
+                    ]
 end
--- a/Casks/anaconda2.rb
+++ b/Casks/anaconda2.rb
@ -7,18 +7,18 @@ cask 'anaconda2' do
  homepage 'https://www.continuum.io/why-anaconda'
  license :gratis

-  depends_on :macos => '>= :lion'
-  container :type => :naked
+  depends_on macos: '>= :lion'
+  container type: :naked

-  installer :script => "Anaconda2-#{version}-MacOSX-x86_64.sh",
-            :args   => ['-b'],
-            :sudo   => false
+  installer script: "Anaconda2-#{version}-MacOSX-x86_64.sh",
+            args:   ['-b'],
+            sudo:   false

  preflight do
    set_permissions "#{staged_path}/Anaconda2-#{version}-MacOSX-x86_64.sh", '+x'
  end

-  uninstall :delete => '~/anaconda2'
+  uninstall delete: '~/anaconda2'

  caveats do
    path_environment_variable '~/anaconda2/bin'
--- a/Casks/android-studio-canary.rb
+++ b/Casks/android-studio-canary.rb
@ -9,14 +9,14 @@ cask 'android-studio-canary' do

  app 'Android Studio.app'

-  zap :delete => [
-                   '~/Library/Preferences/AndroidStudio*',
-                   '~/Library/Preferences/com.google.android.studio.plist',
-                   '~/Library/Application Support/AndroidStudio*',
-                   '~/Library/Logs/AndroidStudio*',
-                   '~/Library/Caches/AndroidStudio*',
-                 ],
-      :rmdir  => '~/AndroidStudioProjects'
+  zap delete: [
+                '~/Library/Preferences/AndroidStudio*',
+                '~/Library/Preferences/com.google.android.studio.plist',
+                '~/Library/Application Support/AndroidStudio*',
+                '~/Library/Logs/AndroidStudio*',
+                '~/Library/Caches/AndroidStudio*',
+              ],
+      rmdir:  '~/AndroidStudioProjects'

  caveats do
    depends_on_java
--- a/Casks/appcode-eap.rb
+++ b/Casks/appcode-eap.rb
@ -7,15 +7,15 @@ cask 'appcode-eap' do
  homepage 'https://confluence.jetbrains.com/display/OBJC/AppCode+EAP'
  license :commercial

-  conflicts_with :cask => 'appcode'
+  conflicts_with cask: 'appcode'

  app 'AppCode EAP.app'

-  zap :delete => [
-                   '~/Library/Preferences/com.jetbrains.AppCode-EAP.plist',
-                   '~/Library/Preferences/AppCode33',
-                   '~/Library/Application Support/AppCode33',
-                   '~/Library/Caches/AppCode33',
-                   '~/Library/Logs/AppCode33',
-                 ]
+  zap delete: [
+                '~/Library/Preferences/com.jetbrains.AppCode-EAP.plist',
+                '~/Library/Preferences/AppCode33',
+                '~/Library/Application Support/AppCode33',
+                '~/Library/Caches/AppCode33',
+                '~/Library/Logs/AppCode33',
+              ]
 end
--- a/Casks/atom-beta.rb
+++ b/Casks/atom-beta.rb
@ -5,29 +5,29 @@ cask 'atom-beta' do
  # github.com is the official download host per the vendor homepage
  url "https://github.com/atom/atom/releases/download/v#{version}/atom-mac.zip"
  appcast 'https://github.com/atom/atom/releases.atom',
-          :checkpoint => 'f6eb5ed94e0d68fd64ad7be63ddacfaea7b3e29e237648c44c3b22e87c8b5ef8'
+          checkpoint: 'f6eb5ed94e0d68fd64ad7be63ddacfaea7b3e29e237648c44c3b22e87c8b5ef8'
  name 'Github Atom Beta'
  homepage 'https://atom.io/beta'
  license :mit

  auto_updates true
-  depends_on :macos => '>= :mountain_lion'
+  depends_on macos: '>= :mountain_lion'

  app 'Atom Beta.app'
-  binary 'Atom Beta.app/Contents/Resources/app/apm/node_modules/.bin/apm', :target => 'apm'
-  binary 'Atom Beta.app/Contents/Resources/app/atom.sh', :target => 'atom-beta'
+  binary 'Atom Beta.app/Contents/Resources/app/apm/node_modules/.bin/apm', target: 'apm'
+  binary 'Atom Beta.app/Contents/Resources/app/atom.sh', target: 'atom-beta'

  postflight do
    suppress_move_to_applications
  end

-  zap :delete => [
-                   '~/.atom',
-                   '~/Library/Application Support/ShipIt_stderr.log',
-                   '~/Library/Application Support/Atom',
-                   '~/Library/Application Support/ShipIt_stdout.log',
-                   '~/Library/Application Support/com.github.atom.ShipIt',
-                   '~/Library/Caches/com.github.atom',
-                   '~/Library/Preferences/com.github.atom.plist',
-                 ]
+  zap delete: [
+                '~/.atom',
+                '~/Library/Application Support/ShipIt_stderr.log',
+                '~/Library/Application Support/Atom',
+                '~/Library/Application Support/ShipIt_stdout.log',
+                '~/Library/Application Support/com.github.atom.ShipIt',
+                '~/Library/Caches/com.github.atom',
+                '~/Library/Preferences/com.github.atom.plist',
+              ]
 end
--- a/Casks/audio-hijack-pro.rb
+++ b/Casks/audio-hijack-pro.rb
@ -7,10 +7,10 @@ cask 'audio-hijack-pro' do
  homepage 'https://www.rogueamoeba.com/audiohijackpro/'
  license :commercial

-  depends_on :macos => %w[
-                         :lion
-                         :mountain_lion
-                       ]
+  depends_on macos: %w[
+                      :lion
+                      :mountain_lion
+                    ]

  app 'Audio Hijack Pro.app'
 end
--- a/Casks/battle-net-zh-cn.rb
+++ b/Casks/battle-net-zh-cn.rb
@ -8,17 +8,17 @@ cask 'battle-net-zh-cn' do
  homepage 'http://www.battlenet.com.cn/zh/'
  license :commercial

-  installer :manual => 'Battle.net-Setup-zhCN.app'
+  installer manual: 'Battle.net-Setup-zhCN.app'

-  uninstall :delete => '/Applications/Battle.net.app'
+  uninstall delete: '/Applications/Battle.net.app'

-  zap :delete => [
-                   '~/Library/Preferences/net.battle.net.app.plist',
-                   '~/Library/Preferences/net.battle.Authenticator.prefs',
-                   '~/Library/Preferences/net.battle.Identity.prefs',
-                   '~/Library/Preferences/net.battnet.battle.plist',
-                   '/Users/Shared/Battle.net',
-                 ]
+  zap delete: [
+                '~/Library/Preferences/net.battle.net.app.plist',
+                '~/Library/Preferences/net.battle.Authenticator.prefs',
+                '~/Library/Preferences/net.battle.Identity.prefs',
+                '~/Library/Preferences/net.battnet.battle.plist',
+                '/Users/Shared/Battle.net',
+              ]

  caveats 'If you pick an installation directory other than /Applications when installing this cask, you will need to uninstall it manually'
 end
--- a/Casks/boot2docker-status-beta.rb
+++ b/Casks/boot2docker-status-beta.rb
@ -5,12 +5,12 @@ cask 'boot2docker-status-beta' do
  # github.com is the official download host per the vendor homepage
  url "https://github.com/nickgartmann/boot2docker-status/releases/download/#{version}/Boot2Docker.Status-v#{version}.beta2.zip"
  appcast 'https://github.com/nickgartmann/boot2docker-status/releases.atom',
-          :checkpoint => 'e399bad2bf54114275f4dbce07312b54338baca54d8489326405130501a02a0e'
+          checkpoint: 'e399bad2bf54114275f4dbce07312b54338baca54d8489326405130501a02a0e'
  name 'Boot2Docker Status'
  homepage 'http://boot2docker-status.nickgartmann.com'
  license :apache

  app 'Boot2Docker Status.app'

-  uninstall :quit => 'RokkinCat.Boot2Docker-Status'
+  uninstall quit: 'RokkinCat.Boot2Docker-Status'
 end
--- a/Casks/camtwist-beta.rb
+++ b/Casks/camtwist-beta.rb
@ -7,10 +7,10 @@ cask 'camtwist-beta' do
  homepage 'http://camtwiststudio.com/'
  license :gratis

-  depends_on :macos => '>= 10.10'
+  depends_on macos: '>= 10.10'

  pkg 'CamTwist.pkg'

-  uninstall :script  => { :executable => 'Manual Install/CamTwist/uninstall.command' },
-            :pkgutil => 'com.allocinit.camtwist.*'
+  uninstall script:  { executable: 'Manual Install/CamTwist/uninstall.command' },
+            pkgutil: 'com.allocinit.camtwist.*'
 end
--- a/Casks/charles-applejava.rb
+++ b/Casks/charles-applejava.rb
@ -9,8 +9,8 @@ cask 'charles-applejava' do

  app 'Charles.app'

-  zap :delete => [
-                   '~/Library/Application Support/Charles',
-                   '~/Library/Preferences/com.xk72.charles.config',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/Charles',
+                '~/Library/Preferences/com.xk72.charles.config',
+              ]
 end
--- a/Casks/charles-beta-applejava.rb
+++ b/Casks/charles-beta-applejava.rb
@ -9,8 +9,8 @@ cask 'charles-beta-applejava' do

  app 'Charles.app'

-  zap :delete => [
-                   '~/Library/Application Support/Charles',
-                   '~/Library/Preferences/com.xk72.charles.config',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/Charles',
+                '~/Library/Preferences/com.xk72.charles.config',
+              ]
 end
--- a/Casks/charles-beta.rb
+++ b/Casks/charles-beta.rb
@ -9,8 +9,8 @@ cask 'charles-beta' do

  app 'Charles.app'

-  zap :delete => [
-                   '~/Library/Application Support/Charles',
-                   '~/Library/Preferences/com.xk72.charles.config',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/Charles',
+                '~/Library/Preferences/com.xk72.charles.config',
+              ]
 end
--- a/Casks/clion-eap.rb
+++ b/Casks/clion-eap.rb
@ -9,11 +9,11 @@ cask 'clion-eap' do

  app 'CLion EAP.app'

-  zap :delete => [
-                   '~/Library/Preferences/com.jetbrains.CLion-EAP.plist',
-                   '~/Library/Preferences/CLion15',
-                   '~/Library/Application Support/CLion15',
-                   '~/Library/Caches/CLion15',
-                   '~/Library/Logs/CLion15',
-                 ]
+  zap delete: [
+                '~/Library/Preferences/com.jetbrains.CLion-EAP.plist',
+                '~/Library/Preferences/CLion15',
+                '~/Library/Application Support/CLion15',
+                '~/Library/Caches/CLion15',
+                '~/Library/Logs/CLion15',
+              ]
 end
--- a/Casks/clipmenu-alpha.rb
+++ b/Casks/clipmenu-alpha.rb
@ -8,7 +8,7 @@ cask 'clipmenu-alpha' do
  homepage 'http://www.clipmenu.com/'
  license :mit

-  depends_on :macos => '>= :mavericks'
+  depends_on macos: '>= :mavericks'

  app 'ClipMenu.app'
 end
--- a/Casks/clipmenu-dev.rb
+++ b/Casks/clipmenu-dev.rb
@ -10,8 +10,8 @@ cask 'clipmenu-dev' do

  app 'ClipMenu.app'

-  zap :delete => [
-                   '~/Library/Application Support/ClipMenu',
-                   '~/Library/Preferences/com.naotaka.ClipMenu.plist',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/ClipMenu',
+                '~/Library/Preferences/com.naotaka.ClipMenu.plist',
+              ]
 end
--- a/Casks/cura-beta.rb
+++ b/Casks/cura-beta.rb
@ -9,5 +9,5 @@ cask 'cura-beta' do

  app 'Cura.app'

-  zap :delete => '~/.cura'
+  zap delete: '~/.cura'
 end
--- a/Casks/dropbox-experimental.rb
+++ b/Casks/dropbox-experimental.rb
@ -9,7 +9,7 @@ cask 'dropbox-experimental' do

  app 'Dropbox.app'

-  uninstall :login_item => 'Dropbox'
+  uninstall login_item: 'Dropbox'

-  zap :delete => '~/.dropbox'
+  zap delete: '~/.dropbox'
 end
--- a/Casks/dupeguru-me.rb
+++ b/Casks/dupeguru-me.rb
@ -4,7 +4,7 @@ cask 'dupeguru-me' do

  url "https://download.hardcoded.net/dupeguru_me_osx_#{version.dots_to_underscores}.dmg"
  appcast 'https://www.hardcoded.net/updates/dupeguru_me.appcast',
-          :checkpoint => 'f723dcab61cd784e37771b074817f6758463271c4179ce372609405996febc5e'
+          checkpoint: 'f723dcab61cd784e37771b074817f6758463271c4179ce372609405996febc5e'
  name 'dupeGuru Music Edition'
  homepage 'https://www.hardcoded.net/dupeguru_me/'
  license :bsd
--- a/Casks/dupeguru-pe.rb
+++ b/Casks/dupeguru-pe.rb
@ -4,7 +4,7 @@ cask 'dupeguru-pe' do

  url "https://download.hardcoded.net/dupeguru_pe_osx_#{version.dots_to_underscores}.dmg"
  appcast 'https://www.hardcoded.net/updates/dupeguru_pe.appcast',
-          :checkpoint => 'e4231cd13e1f317f9e7dce07d2ace620e1be324568a74c08790b0dd4cf96f66a'
+          checkpoint: 'e4231cd13e1f317f9e7dce07d2ace620e1be324568a74c08790b0dd4cf96f66a'
  name 'dupeGuru Picture Edition'
  homepage 'https://www.hardcoded.net/dupeguru_pe/'
  license :bsd
--- a/Casks/firefox-beta-de.rb
+++ b/Casks/firefox-beta-de.rb
@ -9,8 +9,8 @@ cask 'firefox-beta-de' do

  app 'Firefox.app'

-  zap :delete => [
-                   '~/Library/Application Support/Firefox',
-                   '~/Library/Caches/Firefox',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/Firefox',
+                '~/Library/Caches/Firefox',
+              ]
 end
--- a/Casks/firefox-beta-en-gb.rb
+++ b/Casks/firefox-beta-en-gb.rb
@ -9,8 +9,8 @@ cask 'firefox-beta-en-gb' do

  app 'Firefox.app'

-  zap :delete => [
-                   '~/Library/Application Support/Firefox',
-                   '~/Library/Caches/Firefox',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/Firefox',
+                '~/Library/Caches/Firefox',
+              ]
 end
--- a/Casks/firefox-beta-ja.rb
+++ b/Casks/firefox-beta-ja.rb
@ -9,8 +9,8 @@ cask 'firefox-beta-ja' do

  app 'Firefox.app'

-  zap :delete => [
-                   '~/Library/Application Support/Firefox',
-                   '~/Library/Caches/Firefox',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/Firefox',
+                '~/Library/Caches/Firefox',
+              ]
 end
--- a/Casks/firefox-beta-ru.rb
+++ b/Casks/firefox-beta-ru.rb
@ -9,8 +9,8 @@ cask 'firefox-beta-ru' do

  app 'Firefox.app'

-  zap :delete => [
-                   '~/Library/Application Support/Firefox',
-                   '~/Library/Caches/Firefox',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/Firefox',
+                '~/Library/Caches/Firefox',
+              ]
 end
--- a/Casks/firefox-beta-uk.rb
+++ b/Casks/firefox-beta-uk.rb
@ -9,8 +9,8 @@ cask 'firefox-beta-uk' do

  app 'Firefox.app'

-  zap :delete => [
-                   '~/Library/Application Support/Firefox',
-                   '~/Library/Caches/Firefox',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/Firefox',
+                '~/Library/Caches/Firefox',
+              ]
 end
--- a/Casks/firefox-beta-zh-cn.rb
+++ b/Casks/firefox-beta-zh-cn.rb
@ -9,8 +9,8 @@ cask 'firefox-beta-zh-cn' do

  app 'Firefox.app'

-  zap :delete => [
-                   '~/Library/Application Support/Firefox',
-                   '~/Library/Caches/Firefox',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/Firefox',
+                '~/Library/Caches/Firefox',
+              ]
 end
--- a/Casks/firefox-beta.rb
+++ b/Casks/firefox-beta.rb
@ -9,10 +9,10 @@ cask 'firefox-beta' do

  app 'Firefox.app'

-  zap :delete => [
-                   '~/Library/Application Support/Firefox',
-                   '~/Library/Caches/Firefox',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/Firefox',
+                '~/Library/Caches/Firefox',
+              ]

  caveats <<-EOS.undent
  The Mac App Store version of 1Password won't work with a Homebrew-cask-linked Mozilla Firefox. To bypass this limitation, you need to either:
--- a/Casks/firefox-de.rb
+++ b/Casks/firefox-de.rb
@ -9,8 +9,8 @@ cask 'firefox-de' do

  app 'Firefox.app'

-  zap :delete => [
-                   '~/Library/Application Support/Firefox',
-                   '~/Library/Caches/Firefox',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/Firefox',
+                '~/Library/Caches/Firefox',
+              ]
 end
--- a/Casks/firefox-esr-ru.rb
+++ b/Casks/firefox-esr-ru.rb
@ -9,8 +9,8 @@ cask 'firefox-esr-ru' do

  app 'Firefox.app'

-  zap :delete => [
-                   '~/Library/Application Support/Firefox',
-                   '~/Library/Caches/Firefox',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/Firefox',
+                '~/Library/Caches/Firefox',
+              ]
 end
--- a/Casks/firefox-esr-uk.rb
+++ b/Casks/firefox-esr-uk.rb
@ -9,8 +9,8 @@ cask 'firefox-esr-uk' do

  app 'Firefox.app'

-  zap :delete => [
-                   '~/Library/Application Support/Firefox',
-                   '~/Library/Caches/Firefox',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/Firefox',
+                '~/Library/Caches/Firefox',
+              ]
 end
--- a/Casks/firefox-esr-zh-cn.rb
+++ b/Casks/firefox-esr-zh-cn.rb
@ -9,8 +9,8 @@ cask 'firefox-esr-zh-cn' do

  app 'Firefox.app'

-  zap :delete => [
-                   '~/Library/Application Support/Firefox',
-                   '~/Library/Caches/Firefox',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/Firefox',
+                '~/Library/Caches/Firefox',
+              ]
 end
--- a/Casks/firefox-esr.rb
+++ b/Casks/firefox-esr.rb
@ -9,8 +9,8 @@ cask 'firefox-esr' do

  app 'Firefox.app'

-  zap :delete => [
-                   '~/Library/Application Support/Firefox',
-                   '~/Library/Caches/Firefox',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/Firefox',
+                '~/Library/Caches/Firefox',
+              ]
 end
--- a/Casks/firefox-fr.rb
+++ b/Casks/firefox-fr.rb
@ -9,8 +9,8 @@ cask 'firefox-fr' do

  app 'Firefox.app'

-  zap :delete => [
-                   '~/Library/Application Support/Firefox',
-                   '~/Library/Caches/Firefox',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/Firefox',
+                '~/Library/Caches/Firefox',
+              ]
 end
--- a/Casks/firefox-gl.rb
+++ b/Casks/firefox-gl.rb
@ -9,8 +9,8 @@ cask 'firefox-gl' do

  app 'Firefox.app'

-  zap :delete => [
-                   '~/Library/Application Support/Firefox',
-                   '~/Library/Caches/Firefox',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/Firefox',
+                '~/Library/Caches/Firefox',
+              ]
 end
--- a/Casks/firefox-it.rb
+++ b/Casks/firefox-it.rb
@ -9,8 +9,8 @@ cask 'firefox-it' do

  app 'Firefox.app'

-  zap :delete => [
-                   '~/Library/Application Support/Firefox',
-                   '~/Library/Caches/Firefox',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/Firefox',
+                '~/Library/Caches/Firefox',
+              ]
 end
--- a/Casks/firefox-ja.rb
+++ b/Casks/firefox-ja.rb
@ -9,8 +9,8 @@ cask 'firefox-ja' do

  app 'Firefox.app'

-  zap :delete => [
-                   '~/Library/Application Support/Firefox',
-                   '~/Library/Caches/Firefox',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/Firefox',
+                '~/Library/Caches/Firefox',
+              ]
 end
--- a/Casks/firefox-nightly-ja.rb
+++ b/Casks/firefox-nightly-ja.rb
@ -9,8 +9,8 @@ cask 'firefox-nightly-ja' do

  app 'FirefoxNightly.app'

-  zap :delete => [
-                   '~/Library/Application Support/Firefox',
-                   '~/Library/Caches/Firefox',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/Firefox',
+                '~/Library/Caches/Firefox',
+              ]
 end
--- a/Casks/firefox-nightly.rb
+++ b/Casks/firefox-nightly.rb
@ -9,8 +9,8 @@ cask 'firefox-nightly' do

  app 'FirefoxNightly.app'

-  zap :delete => [
-                   '~/Library/Application Support/Firefox',
-                   '~/Library/Caches/Firefox',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/Firefox',
+                '~/Library/Caches/Firefox',
+              ]
 end
--- a/Casks/firefox-nl.rb
+++ b/Casks/firefox-nl.rb
@ -9,8 +9,8 @@ cask 'firefox-nl' do

  app 'Firefox.app'

-  zap :delete => [
-                   '~/Library/Application Support/Firefox',
-                   '~/Library/Caches/Firefox',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/Firefox',
+                '~/Library/Caches/Firefox',
+              ]
 end
--- a/Casks/firefox-pl.rb
+++ b/Casks/firefox-pl.rb
@ -9,8 +9,8 @@ cask 'firefox-pl' do

  app 'Firefox.app'

-  zap :delete => [
-                   '~/Library/Application Support/Firefox',
-                   '~/Library/Caches/Firefox',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/Firefox',
+                '~/Library/Caches/Firefox',
+              ]
 end
--- a/Casks/firefox-pt-br.rb
+++ b/Casks/firefox-pt-br.rb
@ -9,8 +9,8 @@ cask 'firefox-pt-br' do

  app 'Firefox.app'

-  zap :delete => [
-                   '~/Library/Application Support/Firefox',
-                   '~/Library/Caches/Firefox',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/Firefox',
+                '~/Library/Caches/Firefox',
+              ]
 end
--- a/Casks/firefox-ru.rb
+++ b/Casks/firefox-ru.rb
@ -9,8 +9,8 @@ cask 'firefox-ru' do

  app 'Firefox.app'

-  zap :delete => [
-                   '~/Library/Application Support/Firefox',
-                   '~/Library/Caches/Firefox',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/Firefox',
+                '~/Library/Caches/Firefox',
+              ]
 end
--- a/Casks/firefox-uk.rb
+++ b/Casks/firefox-uk.rb
@ -9,8 +9,8 @@ cask 'firefox-uk' do

  app 'Firefox.app'

-  zap :delete => [
-                   '~/Library/Application Support/Firefox',
-                   '~/Library/Caches/Firefox',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/Firefox',
+                '~/Library/Caches/Firefox',
+              ]
 end
--- a/Casks/firefox-zh-cn.rb
+++ b/Casks/firefox-zh-cn.rb
@ -9,8 +9,8 @@ cask 'firefox-zh-cn' do

  app 'Firefox.app'

-  zap :delete => [
-                   '~/Library/Application Support/Firefox',
-                   '~/Library/Caches/Firefox',
-                 ]
+  zap delete: [
+                '~/Library/Application Support/Firefox',
+                '~/Library/Caches/Firefox',
+              ]
 end