Merge pull request #1581 from jawshooah/fix-style

Incorporate `brew cask style` into Travis and fix casks
9 years ago · 5487e4a176
178 changed files with 952 additions and 755 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,64 +1,52 @@
 language: objective-c

-# todo
-#
-# test with Ruby 2.1, but allow failure
-#
+sudo: false

-# "Current" is dependent on OS X release.  At the time of writing, it
-# is always either 1.8 or 2.0
 env:
-  matrix:
-    - CASK_RUBY_TEST_VERSION="2.0"
-    - CASK_RUBY_TEST_VERSION="Current"
+  global:
+    - LANG=en_US.UTF-8
+    - LANGUAGE=en_US.UTF-8
+    - LC_ALL=en_US.UTF-8

-# permit "Current" to fail without affecting our badge
 matrix:
-  allow_failures:
-    - env: CASK_RUBY_TEST_VERSION="Current"
+  include:
+    - env: OSX=10.11 HOMEBREW_RUBY=2.0.0
+      os: osx
+      osx_image: xcode7.2
+      rvm: system
+    - env: OSX=10.10 HOMEBREW_RUBY=2.0.0
+      os: osx
+      osx_image: xcode7.1
+      rvm: system
+    - env: OSX=10.9 HOMEBREW_RUBY=2.0.0
+      os: osx
+      osx_image: beta-xcode6.2
+      rvm: system
  fast_finish: true

-# before_install steps
-# * turn off RVM
-# * set PATH according to env matrix
-# * update Homebrew
-# * informational feedback
+branches:
+  only:
+    - master
+
+cache:
+  directories:
+    - /usr/local
+    - $HOME/.gem
+
 before_install:
-  - rvm use system
-  - export PATH="/System/Library/Frameworks/Ruby.framework/Versions/${CASK_RUBY_TEST_VERSION}/usr/bin":"$PATH"
-  - brew update
-  - printenv PATH
-  - /usr/bin/which ruby
-  - ruby --version
-  - /usr/bin/which rake
-  - rake --version
-  - echo ls_ruby_bindir; ls "/System/Library/Frameworks/Ruby.framework/Versions/${CASK_RUBY_TEST_VERSION}/usr/bin"
+  - . ci/travis/before_install.sh

-# install steps
-# * bundler gem
-# * Ruby gems required for brew-cask
 install:
-  - echo gem_install_bundler; sudo "/System/Library/Frameworks/Ruby.framework/Versions/${CASK_RUBY_TEST_VERSION}/usr/bin/gem" install bundler --bindir="/System/Library/Frameworks/Ruby.framework/Versions/${CASK_RUBY_TEST_VERSION}/usr/bin"
-  - echo bundle; sudo "/System/Library/Frameworks/Ruby.framework/Versions/${CASK_RUBY_TEST_VERSION}/usr/bin/bundle" --system
-  - brew install caskroom/cask/brew-cask
+  - . ci/travis/install.sh

-# informational feedback
 before_script:
-  - printenv PATH
-  - /usr/bin/which ruby
-  - ruby --version
-  - /usr/bin/which bundle
-  - bundle --version
-  - /usr/bin/which rake
-  - rake --version
-  - echo ls_ruby_bindir; ls "/System/Library/Frameworks/Ruby.framework/Versions/${CASK_RUBY_TEST_VERSION}/usr/bin"
+  - . ci/travis/before_script.sh

-# the test itself
-# path-quoting is different here due to YAML constraints
 script:
-  - /System/Library/Frameworks/Ruby.framework/Versions/"${CASK_RUBY_TEST_VERSION}"/usr/bin/bundle exec "/System/Library/Frameworks/Ruby.framework/Versions/${CASK_RUBY_TEST_VERSION}/usr/bin/rake" test
+  - . ci/travis/script.sh

 notifications:
+  email: false
  irc:
    channels:
      - "chat.freenode.net#homebrew-cask"
@ -66,4 +54,9 @@ notifications:
      - "(%{repository_name}) %{build_number}: %{branch}@%{commit} %{author} -> %{message} %{build_url}"
    use_notice: true
    skip_join: true
-  email: false
+  webhooks:
+    urls:
+      - "https://webhooks.gitter.im/e/712d699360b239db14a5"
+    on_success: change
+    on_failure: always
+    on_start: never
--- a/Casks/1password-beta.rb
+++ b/Casks/1password-beta.rb
@ -10,9 +10,9 @@ 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',
+                   '~/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/adium-beta.rb
+++ b/Casks/adium-beta.rb
@ -10,8 +10,8 @@ cask 'adium-beta' do
  app 'Adium.app'

  zap :delete => [
-                  '~/Library/Caches/Adium',
-                  '~/Library/Caches/com.adiumX.adiumX',
-                  '~/Library/Preferences/com.adiumX.adiumX.plist',
+                   '~/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
@ -1,6 +1,6 @@
 cask 'adobe-digital-editions2' do
  version '2.0.1'
-  sha256 'dcaec3e2cbb2faa7720a2ff06d13af4fe0433cdf991c76eeeed28cb0019b69c0' 
+  sha256 'dcaec3e2cbb2faa7720a2ff06d13af4fe0433cdf991c76eeeed28cb0019b69c0'

  url 'http://download.adobe.com/pub/adobe/digitaleditions/ADE_2.0_Installer.dmg'
  name 'Adobe Digital Editions 2.0.1'
@ -9,6 +9,6 @@ cask 'adobe-digital-editions2' do

  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
@ -4,11 +4,13 @@ cask 'adobe-illustrator-cc-de' do

  url 'http://trials3.adobe.com/AdobeProducts/ILST/19/osx10-64/Illustrator_19_LS20.dmg',
      :user_agent => :fake,
-      :cookies => { 'MM_TRIALS' => '1234' }
+      :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'
+
  preflight do
    deployment_xml = "#{staged_path}/Adobe Illustrator CC 2015/Deployment/deployment.xml"

@ -25,6 +27,4 @@ cask 'adobe-illustrator-cc-de' do
  end

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

  url 'http://trials3.adobe.com/AdobeProducts/ILST/19/osx10-64/Illustrator_19_LS20.dmg',
      :user_agent => :fake,
-      :cookies => { 'MM_TRIALS' => '1234' }
+      :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'
+
  preflight do
    deployment_xml = "#{staged_path}/Adobe Illustrator CC 2015/Deployment/deployment.xml"

@ -25,6 +27,4 @@ cask 'adobe-illustrator-cc-es' do
  end

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

  url 'http://trials3.adobe.com/AdobeProducts/ILST/19/osx10-64/Illustrator_19_LS20.dmg',
      :user_agent => :fake,
-      :cookies => { 'MM_TRIALS' => '1234' }
+      :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'
+
  preflight do
    deployment_xml = "#{staged_path}/Adobe Illustrator CC 2015/Deployment/deployment.xml"

@ -25,6 +27,4 @@ cask 'adobe-illustrator-cc-fr' do
  end

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

  url 'http://trials3.adobe.com/AdobeProducts/ILST/19/osx10-64/Illustrator_19_LS20.dmg',
      :user_agent => :fake,
-      :cookies => { 'MM_TRIALS' => '1234' }
+      :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'
+
  preflight do
    deployment_xml = "#{staged_path}/Adobe Illustrator CC 2015/Deployment/deployment.xml"

@ -25,6 +27,4 @@ cask 'adobe-illustrator-cc-it' do
  end

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

  url 'http://trials3.adobe.com/AdobeProducts/ILST/19/osx10-64/Illustrator_19_LS20.dmg',
      :user_agent => :fake,
-      :cookies => { 'MM_TRIALS' => '1234' }
+      :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'
+
  preflight do
    deployment_xml = "#{staged_path}/Adobe Illustrator CC 2015/Deployment/deployment.xml"

@ -25,6 +27,4 @@ cask 'adobe-illustrator-cc-ja' do
  end

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

  url 'http://trials3.adobe.com/AdobeProducts/ILST/19/osx10-64/Illustrator_19_LS20.dmg',
      :user_agent => :fake,
-      :cookies => { 'MM_TRIALS' => '1234' }
+      :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'
+
  preflight do
    deployment_xml = "#{staged_path}/Adobe Illustrator CC 2015/Deployment/deployment.xml"

@ -25,6 +27,4 @@ cask 'adobe-illustrator-cc-nl' do
  end

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

  url 'http://trials3.adobe.com/AdobeProducts/IDSN/11/osx10/InDesign_11_LS20.dmg',
      :user_agent => :fake,
-      :cookies => { 'MM_TRIALS' => '1234' }
+      :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'
+
  preflight do
    deployment_xml = "#{staged_path}/Adobe InDesign CC 2015/deploy/install.xml"

@ -25,6 +27,4 @@ cask 'adobe-indesign-cc-de' do
  end

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

  url 'http://trials3.adobe.com/AdobeProducts/IDSN/11/osx10/InDesign_11_LS20.dmg',
      :user_agent => :fake,
-      :cookies => { 'MM_TRIALS' => '1234' }
+      :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'
+
  preflight do
    deployment_xml = "#{staged_path}/Adobe InDesign CC 2015/deploy/install.xml"

@ -25,6 +27,4 @@ cask 'adobe-indesign-cc-es' do
  end

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

  url 'http://trials3.adobe.com/AdobeProducts/IDSN/11/osx10/InDesign_11_LS20.dmg',
      :user_agent => :fake,
-      :cookies => { 'MM_TRIALS' => '1234' }
+      :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'
+
  preflight do
    deployment_xml = "#{staged_path}/Adobe InDesign CC 2015/deploy/install.xml"

@ -25,6 +27,4 @@ cask 'adobe-indesign-cc-fr' do
  end

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

  url 'http://trials3.adobe.com/AdobeProducts/IDSN/11/osx10/InDesign_11_LS20.dmg',
      :user_agent => :fake,
-      :cookies => { 'MM_TRIALS' => '1234' }
+      :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'
+
  preflight do
    deployment_xml = "#{staged_path}/Adobe InDesign CC 2015/deploy/install.xml"

@ -25,6 +27,4 @@ cask 'adobe-indesign-cc-it' do
  end

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

  url 'http://trials3.adobe.com/AdobeProducts/IDSN/11/osx10/InDesign_11_LS20.dmg',
      :user_agent => :fake,
-      :cookies => { 'MM_TRIALS' => '1234' }
+      :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'
+
  preflight do
    deployment_xml = "#{staged_path}/Adobe InDesign CC 2015/deploy/install.xml"

@ -25,6 +27,4 @@ cask 'adobe-indesign-cc-ja' do
  end

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

  url 'http://trials3.adobe.com/AdobeProducts/IDSN/11/osx10/InDesign_11_LS20.dmg',
      :user_agent => :fake,
-      :cookies => { 'MM_TRIALS' => '1234' }
+      :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'
+
  preflight do
    deployment_xml = "#{staged_path}/Adobe InDesign CC 2015/deploy/install.xml"

@ -25,6 +27,4 @@ cask 'adobe-indesign-cc-nl' do
  end

  uninstall :rmdir => '/Applications/Utilities/Adobe Installers'
-
-  conflicts_with :cask => 'adobe-indesign-cc'
 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
@ -4,11 +4,13 @@ cask 'adobe-photoshop-cc-de' do

  url 'http://trials3.adobe.com/AdobeProducts/PHSP/16/osx10/Photoshop_16_LS20.dmg',
      :user_agent => :fake,
-      :cookies => { 'MM_TRIALS' => '1234' }
+      :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'
+
  preflight do
    file = File.open "#{staged_path}/uninstall.xml", 'w'
    file.puts '<?xml version="1.0" encoding="utf-8"?>
@ -26,7 +28,6 @@ cask 'adobe-photoshop-cc-de' do
    file.close

    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe Photoshop CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe\ Photoshop\ CC\ 2015/Deployment/de_DE_Deployment.xml"
-
  end

  uninstall_preflight do
@ -34,6 +35,4 @@ cask 'adobe-photoshop-cc-de' do
  end

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

  url 'http://trials3.adobe.com/AdobeProducts/PHSP/16/osx10/Photoshop_16_LS20.dmg',
      :user_agent => :fake,
-      :cookies => { 'MM_TRIALS' => '1234' }
+      :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'
+
  preflight do
    file = File.open "#{staged_path}/uninstall.xml", 'w'
    file.puts '<?xml version="1.0" encoding="utf-8"?>
@ -26,7 +28,6 @@ cask 'adobe-photoshop-cc-es' do
    file.close

    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe Photoshop CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe\ Photoshop\ CC\ 2015/Deployment/es_ES_Deployment.xml"
-
  end

  uninstall_preflight do
@ -34,6 +35,4 @@ cask 'adobe-photoshop-cc-es' do
  end

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

  url 'http://trials3.adobe.com/AdobeProducts/PHSP/16/osx10/Photoshop_16_LS20.dmg',
      :user_agent => :fake,
-      :cookies => { 'MM_TRIALS' => '1234' }
+      :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'
+
  preflight do
    file = File.open "#{staged_path}/uninstall.xml", 'w'
    file.puts '<?xml version="1.0" encoding="utf-8"?>
@ -26,7 +28,6 @@ cask 'adobe-photoshop-cc-fr' do
    file.close

    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe Photoshop CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe\ Photoshop\ CC\ 2015/Deployment/fr_FR_Deployment.xml"
-
  end

  uninstall_preflight do
@ -34,6 +35,4 @@ cask 'adobe-photoshop-cc-fr' do
  end

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

  url 'http://trials3.adobe.com/AdobeProducts/PHSP/16/osx10/Photoshop_16_LS20.dmg',
      :user_agent => :fake,
-      :cookies => { 'MM_TRIALS' => '1234' }
+      :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'
+
  preflight do
    file = File.open "#{staged_path}/uninstall.xml", 'w'
    file.puts '<?xml version="1.0" encoding="utf-8"?>
@ -26,7 +28,6 @@ cask 'adobe-photoshop-cc-it' do
    file.close

    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe Photoshop CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe\ Photoshop\ CC\ 2015/Deployment/it_IT_Deployment.xml"
-
  end

  uninstall_preflight do
@ -34,6 +35,4 @@ cask 'adobe-photoshop-cc-it' do
  end

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

  url 'http://trials3.adobe.com/AdobeProducts/PHSP/16/osx10/Photoshop_16_LS20.dmg',
      :user_agent => :fake,
-      :cookies => { 'MM_TRIALS' => '1234' }
+      :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'
+
  preflight do
    file = File.open "#{staged_path}/uninstall.xml", 'w'
    file.puts '<?xml version="1.0" encoding="utf-8"?>
@ -26,7 +28,6 @@ cask 'adobe-photoshop-cc-ja' do
    file.close

    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe Photoshop CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe\ Photoshop\ CC\ 2015/Deployment/ja_JP_Deployment.xml"
-
  end

  uninstall_preflight do
@ -34,6 +35,4 @@ cask 'adobe-photoshop-cc-ja' do
  end

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

  url 'http://trials3.adobe.com/AdobeProducts/PHSP/16/osx10/Photoshop_16_LS20.dmg',
      :user_agent => :fake,
-      :cookies => { 'MM_TRIALS' => '1234' }
+      :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'
+
  preflight do
    file = File.open "#{staged_path}/uninstall.xml", 'w'
    file.puts '<?xml version="1.0" encoding="utf-8"?>
@ -26,7 +28,6 @@ cask 'adobe-photoshop-cc-nl' do
    file.close

    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe Photoshop CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe\ Photoshop\ CC\ 2015/Deployment/nl_NL_Deployment.xml"
-
  end

  uninstall_preflight do
@ -34,6 +35,4 @@ cask 'adobe-photoshop-cc-nl' do
  end

  uninstall :rmdir => '/Applications/Utilities/Adobe Installers'
-
-  conflicts_with :cask => 'adobe-photoshop-cc'
 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
@ -28,10 +28,10 @@ cask 'adobe-photoshop-cs5' do
  # deployment file. launching the uninstall app will not work in silent mode.
  # keeping the code here and commented out in case there's a way.

-  #uninstall_preflight do
+  # uninstall_preflight do
  #  system '/usr/bin/killall', '-kill', 'SafariNotificationAgent'
  #  system '/usr/bin/sudo', '-E', '--', "/Library/Application Support/Adobe/Uninstall/{15FEDA5F-141C-4127-8D7E-B962D1742728}.app/Contents/MacOS/Uninstall Product", "--mode=silent", "--deploymentFile=#{staged_path}/Adobe CS6 Design Standard/deploy/uninstall-en_US.xml"
-  #end
+  # end

  caveats 'Installation or Uninstallation may fail with Exit Code 19 (Conflicting Processes running) if Browsers, Safari Notification Service or SIMBL Services (e.g. Flashlight) 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 identifify the conflicting processes.'
 end
--- a/Casks/adobe-photoshop-lightroom571.rb
+++ b/Casks/adobe-photoshop-lightroom571.rb
@ -2,7 +2,7 @@ cask 'adobe-photoshop-lightroom571' do
  version '5.7.1'
  sha256 '155a91e2c90927a05ccaa244a99fed4784fa7cf26d08c634f5f111629f6b0418'

-  url "http://download.adobe.com/pub/adobe/lightroom/mac/#{version.to_i}.x/Lightroom_#{version.to_i}_LS11_mac_#{version.gsub('.','_')}.dmg"
+  url "http://download.adobe.com/pub/adobe/lightroom/mac/#{version.to_i}.x/Lightroom_#{version.to_i}_LS11_mac_#{version.gsub('.', '_')}.dmg"
  name 'Adobe Photoshop Lightroom'
  homepage 'https://www.adobe.com/products/photoshop-lightroom.html'
  license :commercial
@ -10,10 +10,11 @@ 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"
+            :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",
+                         '~/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
@ -20,13 +20,14 @@ cask 'adobe-photoshop-lightroom600' do

  uninstall_preflight do
    system '/usr/bin/killall', '-kill', 'SafariNotificationAgent'
-    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Install.app/Contents/MacOS/Install", "--mode=silent", "--deploymentFile=#{staged_path}/deploy/AdobeLightroom6.remove.xml"
+    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",
+                         '~/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.'
--- 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
@ -5,13 +5,15 @@ cask 'adobe-reader-de' do
  url "http://ardownload.adobe.com/pub/adobe/reader/mac/#{version.to_i}.x/#{version}/de_DE/AdbeRdr#{version.gsub('.', '')}_de_DE.dmg"
  name 'Adobe Reader'
  homepage 'https://www.adobe.com/de/products/reader.html'
-  license :unknown
+  license :unknown # TODO: change license and remove this comment; ':unknown' is a machine-generated placeholder

  pkg 'Adobe Reader XI Installer.pkg'
+
  uninstall :pkgutil => "com.adobe.acrobat.reader.#{version.gsub('.', '')}.*",
-            :delete => '/Applications/Adobe Reader.app'
+            :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/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
@ -5,13 +5,15 @@ cask 'adobe-reader-fr' do
  url "http://ardownload.adobe.com/pub/adobe/reader/mac/#{version.to_i}.x/#{version}/fr_FR/AdbeRdr#{version.gsub('.', '')}_fr_FR.dmg"
  name 'Adobe Reader'
  homepage 'https://www.adobe.com/fr/products/reader.html'
-  license :unknown
+  license :unknown # TODO: change license and remove this comment; ':unknown' is a machine-generated placeholder

  pkg 'Adobe Reader XI Installer.pkg'
+
  uninstall :pkgutil => "com.adobe.acrobat.reader.#{version.gsub('.', '')}.*",
-            :delete => '/Applications/Adobe Reader.app'
+            :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/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
@ -1,6 +1,7 @@
 cask 'adobe-reader-ja' do
  version '11.0.00'
  sha256 '69f71085799700ecd7e7f59e14095eafc5889e8962ed3a2e84e0a40d3a04d570'
+
  major_version = version.split('.')[0]

  url "http://ardownload.adobe.com/pub/adobe/reader/mac/#{major_version}.x/#{version}/ja_JP/AdbeRdr#{version.gsub('.', '')}_ja_JP.dmg"
@ -9,6 +10,7 @@ cask 'adobe-reader-ja' do
  license :closed

  pkg 'Adobe Reader XI Installer.pkg'
+
  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
@ -10,10 +10,11 @@ cask 'adobe-reader-pl' do
  pkg 'Adobe Reader XI Installer.pkg'

  uninstall :pkgutil => "com.adobe.acrobat.reader.#{version.gsub('.', '')}.*",
-            :delete => '/Applications/Adobe Reader.app'
+            :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'
+                         "~/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
@ -8,10 +8,12 @@ cask 'adobe-reader-pt-br' do
  license :gratis

  pkg 'Adobe Reader XI Installer.pkg'
+
  uninstall :pkgutil => "com.adobe.acrobat.reader.#{version.gsub('.', '')}.*",
-            :delete => '/Applications/Adobe Reader.app'
+            :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/Application Support/Adobe/Acrobat/#{version.sub(%r{(\d+)\.(\d+)\.*}, '\1.\2')}",
+                         '~/Library/Preferences/com.adobe.Reader.plist',
                       ]
 end
--- a/Casks/airmail-beta.rb
+++ b/Casks/airmail-beta.rb
@ -6,7 +6,7 @@ cask 'airmail-beta' do
  url 'https://rink.hockeyapp.net/api/2/apps/84be85c3331ee1d222fd7f0b59e41b04?format=zip'
  name 'AirMail'
  homepage 'http://airmailapp.com/beta/'
-  license :unknown
+  license :unknown # TODO: change license and remove this comment; ':unknown' is a machine-generated placeholder

  app 'AirMail Beta.app'
 end
--- a/Casks/anaconda2.rb
+++ b/Casks/anaconda2.rb
@ -7,21 +7,20 @@ cask 'anaconda2' do
  homepage 'https://www.continuum.io/why-anaconda'
  license :gratis

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

+  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

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

  caveats do
    path_environment_variable '~/anaconda2/bin'
  end
-
-  depends_on :macos => '>= :lion'
 end
--- a/Casks/android-studio-canary.rb
+++ b/Casks/android-studio-canary.rb
@ -2,13 +2,13 @@ cask 'android-studio-canary' do
  version '2.0.0.5-143.2532994'
  sha256 '9d86b86a902fc756ecdc600f39a5b847fc119d7af80303f6f30d65974ae6bd07'

-  url "https://dl.google.com/dl/android/studio/ide-zips/#{version.sub(%r{-.*},'')}/android-studio-ide-#{version.sub(%r{.*?-},'')}-mac.zip"
+  url "https://dl.google.com/dl/android/studio/ide-zips/#{version.sub(%r{-.*}, '')}/android-studio-ide-#{version.sub(%r{.*?-}, '')}-mac.zip"
  name 'Android Studio Canary'
  homepage 'https://sites.google.com/a/android.com/tools/download/studio/canary'
  license :apache

  app 'Android Studio.app'
-  
+
  zap :delete => [
                   '~/Library/Preferences/AndroidStudio*',
                   '~/Library/Preferences/com.google.android.studio.plist',
@ -16,7 +16,7 @@ cask 'android-studio-canary' do
                   '~/Library/Logs/AndroidStudio*',
                   '~/Library/Caches/AndroidStudio*',
                 ],
-      :rmdir => '~/AndroidStudioProjects'
+      :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'
+
  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',
+                   '~/Library/Preferences/com.jetbrains.AppCode-EAP.plist',
+                   '~/Library/Preferences/AppCode33',
+                   '~/Library/Application Support/AppCode33',
+                   '~/Library/Caches/AppCode33',
+                   '~/Library/Logs/AppCode33',
                 ]
-
-  conflicts_with :cask => 'appcode'
 end
--- a/Casks/atom-beta.rb
+++ b/Casks/atom-beta.rb
@ -22,12 +22,12 @@ cask 'atom-beta' do
  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',
+                   '~/.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
@ -2,15 +2,15 @@ cask 'audio-hijack-pro' do
  version '2.11.4'
  sha256 '7fd4dc4b08b1b0e72dbf59b47c655840ceb75801d0362c778c436a2532ae239c'

-  url "https://rogueamoeba.com/legacy/downloads/AudioHijackPro-#{version.gsub('.','')}.zip"
+  url "https://rogueamoeba.com/legacy/downloads/AudioHijackPro-#{version.gsub('.', '')}.zip"
  name 'Audio Hijack Pro'
  homepage 'https://www.rogueamoeba.com/audiohijackpro/'
  license :commercial

-  app 'Audio Hijack Pro.app'
+  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
@ -13,11 +13,11 @@ cask 'battle-net-zh-cn' do
  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'
+                   '~/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'
--- a/Casks/camtwist-beta.rb
+++ b/Casks/camtwist-beta.rb
@ -6,11 +6,11 @@ cask 'camtwist-beta' do
  name 'CamTwist'
  homepage 'http://camtwiststudio.com/'
  license :gratis
-  
+
  depends_on :macos => '>= 10.10'

  pkg 'CamTwist.pkg'

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

-  url "https://www.charlesproxy.com/assets/release/#{version.gsub(/b\d$/, '')}/charles-proxy-#{version}-applejava.dmg"
+  url "https://www.charlesproxy.com/assets/release/#{version.gsub(%r{b\d$}, '')}/charles-proxy-#{version}-applejava.dmg"
  name 'Charles'
  homepage 'https://www.charlesproxy.com/download/'
  license :commercial
@ -10,7 +10,7 @@ cask 'charles-applejava' do
  app 'Charles.app'

  zap :delete => [
-                  '~/Library/Application Support/Charles',
-                  '~/Library/Preferences/com.xk72.charles.config',
+                   '~/Library/Application Support/Charles',
+                   '~/Library/Preferences/com.xk72.charles.config',
                 ]
 end
--- a/Casks/charles-beta-applejava.rb
+++ b/Casks/charles-beta-applejava.rb
@ -2,7 +2,7 @@ cask 'charles-beta-applejava' do
  version '3.11.3b5'
  sha256 'd2ed58fc2e5d4a77c79932819edadb127f4963ea71b2c3843fc13946a02c0410'

-  url "https://www.charlesproxy.com/assets/release/#{version.gsub(/b\d$/, '')}/charles-proxy-#{version}-applejava.dmg"
+  url "https://www.charlesproxy.com/assets/release/#{version.gsub(%r{b\d$}, '')}/charles-proxy-#{version}-applejava.dmg"
  name 'Charles'
  homepage 'https://www.charlesproxy.com/download/beta/'
  license :commercial
@ -10,7 +10,7 @@ cask 'charles-beta-applejava' do
  app 'Charles.app'

  zap :delete => [
-                  '~/Library/Application Support/Charles',
-                  '~/Library/Preferences/com.xk72.charles.config',
+                   '~/Library/Application Support/Charles',
+                   '~/Library/Preferences/com.xk72.charles.config',
                 ]
 end
--- a/Casks/charles-beta.rb
+++ b/Casks/charles-beta.rb
@ -2,7 +2,7 @@ cask 'charles-beta' do
  version '3.11.3b5'
  sha256 'ef1215db67aaede00dc61b260d79a051efdc32e0760b9c9f87d1155082705d85'

-  url "https://www.charlesproxy.com/assets/release/#{version.gsub(/b\d$/, '')}/charles-proxy-#{version}.dmg"
+  url "https://www.charlesproxy.com/assets/release/#{version.gsub(%r{b\d$}, '')}/charles-proxy-#{version}.dmg"
  name 'Charles'
  homepage 'https://www.charlesproxy.com/download/beta/'
  license :commercial
@ -10,7 +10,7 @@ cask 'charles-beta' do
  app 'Charles.app'

  zap :delete => [
-                  '~/Library/Application Support/Charles',
-                  '~/Library/Preferences/com.xk72.charles.config',
+                   '~/Library/Application Support/Charles',
+                   '~/Library/Preferences/com.xk72.charles.config',
                 ]
 end
--- a/Casks/clion-eap.rb
+++ b/Casks/clion-eap.rb
@ -10,10 +10,10 @@ 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',
-  ]
+                   '~/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

-  app 'ClipMenu.app'
-
  depends_on :macos => '>= :mavericks'
+
+  app 'ClipMenu.app'
 end
--- a/Casks/clipmenu-dev.rb
+++ b/Casks/clipmenu-dev.rb
@ -11,7 +11,7 @@ cask 'clipmenu-dev' do
  app 'ClipMenu.app'

  zap :delete => [
-                  '~/Library/Application Support/ClipMenu',
-                  '~/Library/Preferences/com.naotaka.ClipMenu.plist',
+                   '~/Library/Application Support/ClipMenu',
+                   '~/Library/Preferences/com.naotaka.ClipMenu.plist',
                 ]
 end
--- a/Casks/dropbox-experimental.rb
+++ b/Casks/dropbox-experimental.rb
@ -8,8 +8,8 @@ cask 'dropbox-experimental' do
  license :gratis

  app 'Dropbox.app'
-  
+
  uninstall :login_item => 'Dropbox'
-  
+
  zap :delete => '~/.dropbox'
 end
--- a/Casks/earlybird.rb
+++ b/Casks/earlybird.rb
@ -1,6 +1,6 @@
 cask 'earlybird' do
  version '43.0a2'
-  sha256 :no_check  # required as upstream package is updated in-placea
+  sha256 :no_check # required as upstream package is updated in-placea

  url "https://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/latest-earlybird/thunderbird-#{version}.en-US.mac.dmg"
  name 'Earlybird'
--- a/Casks/firefox-beta-de.rb
+++ b/Casks/firefox-beta-de.rb
@ -10,7 +10,7 @@ cask 'firefox-beta-de' do
  app 'Firefox.app'

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

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

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

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

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

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

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

  caveats <<-EOS.undent
--- a/Casks/firefox-de.rb
+++ b/Casks/firefox-de.rb
@ -10,7 +10,7 @@ cask 'firefox-de' do
  app 'Firefox.app'

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  zap :delete => [
-                  '~/Library/Application Support/Firefox',
-                  '~/Library/Caches/Firefox',
+                   '~/Library/Application Support/Firefox',
+                   '~/Library/Caches/Firefox',
                 ]
 end
--- a/Casks/firefoxdeveloperedition-ja.rb
+++ b/Casks/firefoxdeveloperedition-ja.rb
@ -2,7 +2,7 @@ cask 'firefoxdeveloperedition-ja' do
  version :latest
  sha256 :no_check

-  url "https://download.mozilla.org/?product=firefox-aurora-latest-l10n&os=osx&lang=ja-JP-mac"
+  url 'https://download.mozilla.org/?product=firefox-aurora-latest-l10n&os=osx&lang=ja-JP-mac'
  name 'Mozilla Firefox Developer Edition'
  homepage 'https://www.mozilla.org/ja/firefox/developer/'
  license :mpl
--- a/Casks/firefoxdeveloperedition.rb
+++ b/Casks/firefoxdeveloperedition.rb
@ -2,7 +2,7 @@ cask 'firefoxdeveloperedition' do
  version :latest
  sha256 :no_check

-  url "https://download.mozilla.org/?product=firefox-aurora-latest-ssl&os=osx&lang=en-US"
+  url 'https://download.mozilla.org/?product=firefox-aurora-latest-ssl&os=osx&lang=en-US'
  name 'Mozilla Firefox Developer Edition'
  homepage 'https://www.mozilla.org/en-US/firefox/developer/'
  license :mpl