Fix all casks with brew cask style --fix

9 years ago · 68a7e21bef
170 changed files with 722 additions and 710 deletions
--- a/Casks/adobe-illustrator-cc-de.rb
+++ b/Casks/adobe-illustrator-cc-de.rb
@ -9,6 +9,8 @@ cask 'adobe-illustrator-cc-de' do
  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
@ -9,6 +9,8 @@ cask 'adobe-illustrator-cc-es' do
  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
@ -9,6 +9,8 @@ cask 'adobe-illustrator-cc-fr' do
  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
@ -9,6 +9,8 @@ cask 'adobe-illustrator-cc-it' do
  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
@ -9,6 +9,8 @@ cask 'adobe-illustrator-cc-ja' do
  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
@ -9,6 +9,8 @@ cask 'adobe-illustrator-cc-nl' do
  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
@ -9,6 +9,8 @@ cask 'adobe-indesign-cc-de' do
  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
@ -9,6 +9,8 @@ cask 'adobe-indesign-cc-es' do
  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
@ -9,6 +9,8 @@ cask 'adobe-indesign-cc-fr' do
  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
@ -9,6 +9,8 @@ cask 'adobe-indesign-cc-it' do
  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
@ -9,6 +9,8 @@ cask 'adobe-indesign-cc-ja' do
  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
@ -9,6 +9,8 @@ cask 'adobe-indesign-cc-nl' do
  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-photoshop-cc-de.rb
+++ b/Casks/adobe-photoshop-cc-de.rb
@ -9,6 +9,8 @@ cask 'adobe-photoshop-cc-de' do
  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
@ -9,6 +9,8 @@ cask 'adobe-photoshop-cc-es' do
  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
@ -9,6 +9,8 @@ cask 'adobe-photoshop-cc-fr' do
  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
@ -9,6 +9,8 @@ cask 'adobe-photoshop-cc-it' do
  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
@ -9,6 +9,8 @@ cask 'adobe-photoshop-cc-ja' do
  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
@ -9,6 +9,8 @@ cask 'adobe-photoshop-cc-nl' do
  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-lightroom571.rb
+++ b/Casks/adobe-photoshop-lightroom571.rb
@ -12,6 +12,7 @@ cask 'adobe-photoshop-lightroom571' do
  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",
--- a/Casks/adobe-photoshop-lightroom600.rb
+++ b/Casks/adobe-photoshop-lightroom600.rb
@ -20,10 +20,11 @@ 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",
--- a/Casks/adobe-reader-de.rb
+++ b/Casks/adobe-reader-de.rb
@ -5,11 +5,13 @@ 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'
+
  zap       :delete => [
                         "~/Library/Application Support/Adobe/Acrobat/#{version.sub(%r{(\d+)\.(\d+).*}, '\1.\2')}",
                         '~/Library/Preferences/com.adobe.Reader.plist',
--- a/Casks/adobe-reader-fr.rb
+++ b/Casks/adobe-reader-fr.rb
@ -5,11 +5,13 @@ 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'
+
  zap       :delete => [
                         "~/Library/Application Support/Adobe/Acrobat/#{version.sub(%r{(\d+)\.(\d+)\.*}, '\1.\2')}",
                         '~/Library/Preferences/com.adobe.Reader.plist',
--- 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
@ -11,9 +11,10 @@ cask 'adobe-reader-pl' do

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

-  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

+  preflight do
+    set_permissions "#{staged_path}/Anaconda2-#{version}-MacOSX-x86_64.sh", '+x'
+  end
+
  uninstall :delete => '~/anaconda2'

  caveats do
    path_environment_variable '~/anaconda2/bin'
  end
-
-  depends_on :macos => '>= :lion'
 end
--- a/Casks/appcode-eap.rb
+++ b/Casks/appcode-eap.rb
@ -7,6 +7,8 @@ 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 => [
@ -16,6 +18,4 @@ cask 'appcode-eap' do
                   '~/Library/Caches/AppCode33',
                   '~/Library/Logs/AppCode33',
                 ]
-
-  conflicts_with :cask => 'appcode'
 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

-  app 'Audio Hijack Pro.app'
-
-  depends_on :macos => %w{
+  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
@ -17,7 +17,7 @@ cask 'battle-net-zh-cn' do
                   '~/Library/Preferences/net.battle.Authenticator.prefs',
                   '~/Library/Preferences/net.battle.Identity.prefs',
                   '~/Library/Preferences/net.battnet.battle.plist',
-                  '/Users/Shared/Battle.net'
+                   '/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/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
--- 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
--- 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
--- 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/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
--- a/Casks/google-japanese-ime-dev.rb
+++ b/Casks/google-japanese-ime-dev.rb
@ -13,6 +13,6 @@ cask 'google-japanese-ime-dev' do
  uninstall :pkgutil   => 'com.google.pkg.GoogleJapaneseInput',
            :launchctl => [
                            'com.google.inputmethod.Japanese.Converter',
-                           'com.google.inputmethod.Japanese.Renderer'
+                            'com.google.inputmethod.Japanese.Renderer',
                          ]
 end
--- a/Casks/handbrakecli-nightly.rb
+++ b/Casks/handbrakecli-nightly.rb
@ -7,7 +7,7 @@ cask 'handbrakecli-nightly' do
  homepage 'https://handbrake.fr'
  license :gpl

-  binary 'HandBrakeCLI'
-
  depends_on :macos => '>= :snow_leopard'
+
+  binary 'HandBrakeCLI'
 end
--- a/Casks/hearthstone-en-gb.rb
+++ b/Casks/hearthstone-en-gb.rb
@ -5,7 +5,7 @@ cask 'hearthstone-en-gb' do
  url 'https://eu.battle.net/download/getInstaller?os=mac&installer=Hearthstone-Setup-enGB.zip'
  name 'Hearthstone'
  homepage 'http://eu.battle.net/hearthstone/en/'
-  license :unknown
+  license :unknown # TODO: change license and remove this comment; ':unknown' is a machine-generated placeholder

  installer :manual => 'Hearthstone-Setup-enGB.app'
 end
--- a/Casks/hearthstone-ko.rb
+++ b/Casks/hearthstone-ko.rb
@ -5,7 +5,7 @@ cask 'hearthstone-ko' do
  url 'http://dist.blizzard.com/downloads/hs-installers/a6029a1d625c79252defff3914fb6e67/retail.1/Hearthstone-Setup-koKR.zip'
  name 'Hearthstone'
  homepage 'http://kr.battle.net/hearthstone/ko/'
-  license :unknown    # todo: change license and remove this comment; ':unknown' is a machine-generated placeholder
+  license :unknown # TODO: change license and remove this comment; ':unknown' is a machine-generated placeholder

  installer :manual => 'Hearthstone-Setup-koKR.app'
 end
--- a/Casks/java-beta.rb
+++ b/Casks/java-beta.rb
@ -9,6 +9,7 @@ cask 'java-beta' do
  license :gratis

  pkg 'JDK 8 Update 72.pkg'
+
  postflight do
    system '/usr/bin/sudo', '-E', '--',
           '/usr/libexec/PlistBuddy', '-c', 'Add :JavaVM:JVMCapabilities: string BundledApp', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist"
@ -32,7 +33,7 @@ cask 'java-beta' do

  uninstall :pkgutil => 'com.oracle.jdk8u72',
            :delete  => [
-                          MacOS.release <= :mavericks ? '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' : ''
+                          MacOS.release <= :mavericks ? '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' : '',
                        ].keep_if { |v| !v.empty? }

  zap       :delete => [
--- a/Casks/java6.rb
+++ b/Casks/java6.rb
@ -5,7 +5,7 @@ cask 'java6' do
  url 'https://support.apple.com/downloads/DL1572/en_US/javaforosx.dmg'
  name 'Java Standard Edition Development Kit'
  homepage 'https://support.apple.com/kb/DL1572'
-  license :unknown
+  license :unknown # TODO: change license and remove this comment; ':unknown' is a machine-generated placeholder

  pkg 'JavaForOSX.pkg'

--- a/Casks/java7.rb
+++ b/Casks/java7.rb
@ -4,13 +4,14 @@ cask 'java7' do

  url 'http://download.oracle.com/otn-pub/java/jdk/7u80-b15/jdk-7u80-macosx-x64.dmg',
      :cookies => {
-                    'oraclelicense' => 'accept-securebackup-cookie'
+                    'oraclelicense' => 'accept-securebackup-cookie',
                  }
  name 'Java Standard Edition Development Kit'
  homepage 'http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html'
  license :gratis

  pkg 'JDK 7 Update 80.pkg'
+
  postflight do
    system '/usr/bin/sudo', '-E', '--',
           '/usr/libexec/PlistBuddy', '-c', 'Add :JavaVM:JVMCapabilities: string BundledApp', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist"
@ -34,7 +35,7 @@ cask 'java7' do

  uninstall :pkgutil => 'com.oracle.jdk7u80',
            :delete  => [
-                          MacOS.release <= :mavericks ? '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' : ''
+                          MacOS.release <= :mavericks ? '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' : '',
                        ].keep_if { |v| !v.empty? }

  zap       :delete => [
--- a/Casks/java9-beta.rb
+++ b/Casks/java9-beta.rb
@ -9,6 +9,7 @@ cask 'java9-beta' do
  license :gratis

  pkg 'JDK 9.pkg'
+
  postflight do
    system '/usr/bin/sudo', '-E', '--',
           '/usr/libexec/PlistBuddy', '-c', 'Add :JavaVM:JVMCapabilities: string BundledApp', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist"
@ -32,7 +33,7 @@ cask 'java9-beta' do

  uninstall :pkgutil => 'com.oracle.jdk9',
            :delete  => [
-                          MacOS.release <= :mavericks ? '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' : ''
+                          MacOS.release <= :mavericks ? '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' : '',
                        ].keep_if { |v| !v.empty? }

  zap       :delete => [
--- a/Casks/julia-nightly.rb
+++ b/Casks/julia-nightly.rb
@ -8,10 +8,10 @@ cask 'julia-nightly' do
  homepage 'http://julialang.org'
  license :mit

+  depends_on :macos => '>= :lion'
+
  app "Julia-#{version.sub(%r{(.+)-(.+)}, '\1-dev-\2')}.app"
  binary "Julia-#{version.sub(%r{(.+)-(.+)}, '\1-dev-\2')}.app/Contents/Resources/julia/bin/julia"

-  depends_on :macos => '>= :lion'
-
  zap :delete => '~/.julia'
 end
--- a/Casks/kicad-nightly.rb
+++ b/Casks/kicad-nightly.rb
@ -7,6 +7,6 @@ cask 'kicad-nightly' do
  homepage 'http://www.kicad-pcb.org'
  license :gpl

-  artifact 'kicad', :target => Pathname.new(File.expand_path('~')).join('Library/Application Support/kicad')
  suite 'Kicad'
+  artifact 'kicad', :target => Pathname.new(File.expand_path('~')).join('Library/Application Support/kicad')
 end
--- a/Casks/libreoffice-beta.rb
+++ b/Casks/libreoffice-beta.rb
@ -3,11 +3,11 @@ cask 'libreoffice-beta' do
  sha256 '4ff5f22273b7e9e8abaabbbcd62bbbb06c2c90c9c45030f00a324f0cca26f73b'

  url "https://download.documentfoundation.org/libreoffice/testing/#{version.split('.')[0..2].join('.')}/mac/x86_64/LibreOfficeDev_#{version}_MacOS_x86-64.dmg"
-  gpg "#{url}.asc",
-      :key_id => 'c2839ecad9408fbe9531c3e9f434a1efafeeaea3'
  name 'LibreOfficeDev'
  homepage 'https://www.libreoffice.org/download/pre-releases/'
  license :mpl
+  gpg "#{url}.asc",
+      :key_id => 'c2839ecad9408fbe9531c3e9f434a1efafeeaea3'

  app 'LibreOfficeDev.app'
 end
--- a/Casks/macaw-indigo.rb
+++ b/Casks/macaw-indigo.rb
@ -3,9 +3,9 @@ cask 'macaw-indigo' do
  sha256 '6f284ca20a7259c76ad8695e9b0522d374dd9e4d61657d39066b9ce9e9c2faea'

  url "http://indigo.macaw.co/#{version}/MacawIndigo#{version}.dmg"
-  name 'Macaw Indigo'
  appcast 'http://indigo.macaw.co/appcast.xml',
          :checkpoint => 'edbeacf73c56b690aa98a6aedb82c1892c4d79b4bc0a3b87a6094765699793ff'
+  name 'Macaw Indigo'
  homepage 'http://indigo.macaw.co/'
  license :commercial

--- a/Casks/macvim-kaoriya.rb
+++ b/Casks/macvim-kaoriya.rb
@ -10,23 +10,19 @@ cask 'macvim-kaoriya' do
  url "https://github.com/splhack/macvim-kaoriya/releases/download/#{version.sub(%r{.*-}, '')}/MacVim-KaoriYa-#{version.sub(%r{.*-}, '')}.dmg"
  appcast 'https://raw.githubusercontent.com/splhack/macvim-kaoriya/master/latest.xml',
          :checkpoint => '6ead50ae50df4feef5f1e985b9295e19c30c13992cb6794afa991a7f9d5d23f0'
-
  name 'MacVim KaoriYa'
  homepage 'https://github.com/splhack/macvim-kaoriya'
  license :oss

-  app 'MacVim.app'
  depends_on :macos => '>= :lion'
+
+  app 'MacVim.app'
+
  mvim = 'MacVim.app/Contents/MacOS/mvim'
  executables = %w[macvim-askpass mvim mvimdiff mview mvimex gvim gvimdiff gview gvimex]
  executables += %w[vi vim vimdiff view vimex] if ARGV.include? '--override-system-vim'
  executables.each { |e| binary mvim, :target => e }

-  zap :delete => [
-                  '~/Library/Preferences/org.vim.MacVim.LSSharedFileList.plist',
-                  '~/Library/Preferences/org.vim.MacVim.plist',
-                 ]
-
  postflight do
    system 'ruby',
           '-i.bak',
@ -35,6 +31,11 @@ cask 'macvim-kaoriya' do
           staged_path.join(mvim)
  end

+  zap :delete => [
+                   '~/Library/Preferences/org.vim.MacVim.LSSharedFileList.plist',
+                   '~/Library/Preferences/org.vim.MacVim.plist',
+                 ]
+
  caveats do
    files_in_usr_local
    <<-EOS.undent
--- a/Casks/microsoft-office-2011.rb
+++ b/Casks/microsoft-office-2011.rb
@ -11,9 +11,10 @@ cask 'microsoft-office-2011' do

  uninstall :pkgutil   => 'com.microsoft.office.*',
            :launchctl => 'com.microsoft.office.licensing.helper'
+
  zap       :pkgutil => [
                          'com.microsoft.mau.all.autoupdate.*',
-                           'com.microsoft.merp.all.errorreporting.*'
+                          'com.microsoft.merp.all.errorreporting.*',
                        ],
            :delete  => [
                          '/Library/LaunchDaemons/com.microsoft.office.licensing.helper.plist',
@ -43,11 +44,11 @@ cask 'microsoft-office-2011' do
                          '~/Documents/Microsoft User Data/Microsoft',
                          '~/Documents/Microsoft User Data/Office 2011 Identities',
                          '~/Documents/Microsoft User Data/Outlook Sound Sets',
-                           '~/Documents/Microsoft User Data/Saved Attachments'
+                          '~/Documents/Microsoft User Data/Saved Attachments',
                        ],
            :rmdir   => [
                          '/Library/Application Support/Microsoft',
                          '~/Library/Application Support/Microsoft',
-                           '~/Documents/Microsoft User Data'
+                          '~/Documents/Microsoft User Data',
                        ]
 end
--- a/Casks/microsoft-office-de.rb
+++ b/Casks/microsoft-office-de.rb
@ -11,9 +11,10 @@ cask 'microsoft-office-de' do

  uninstall :pkgutil   => 'com.microsoft.office.*',
            :launchctl => 'com.microsoft.office.licensing.helper'
+
  zap       :pkgutil => [
                          'com.microsoft.mau.all.autoupdate.*',
-                           'com.microsoft.merp.all.errorreporting.*'
+                          'com.microsoft.merp.all.errorreporting.*',
                        ],
            :delete  => [
                          '/Library/LaunchDaemons/com.microsoft.office.licensing.helper.plist',
@ -43,11 +44,11 @@ cask 'microsoft-office-de' do
                          '~/Documents/Microsoft-Benutzerdaten/Microsoft',
                          '~/Documents/Microsoft-Benutzerdaten/Office 2011 Identities',
                          '~/Documents/Microsoft-Benutzerdaten/Outlook Sound Sets',
-                           '~/Documents/Microsoft-Benutzerdaten/Saved Attachments'
+                          '~/Documents/Microsoft-Benutzerdaten/Saved Attachments',
                        ],
            :rmdir   => [
                          '/Library/Application Support/Microsoft',
                          '~/Library/Application Support/Microsoft',
-                           '~/Documents/Microsoft-Benutzerdaten'
+                          '~/Documents/Microsoft-Benutzerdaten',
                        ]
 end
--- a/Casks/microsoft-office-ja.rb
+++ b/Casks/microsoft-office-ja.rb
@ -11,9 +11,10 @@ cask 'microsoft-office-ja' do

  uninstall :pkgutil   => 'com.microsoft.office.*',
            :launchctl => 'com.microsoft.office.licensing.helper'
+
  zap       :pkgutil => [
                          'com.microsoft.mau.all.autoupdate.*',
-                           'com.microsoft.merp.all.errorreporting.*'
+                          'com.microsoft.merp.all.errorreporting.*',
                        ],
            :delete  => [
                          '/Library/LaunchDaemons/com.microsoft.office.licensing.helper.plist',
@ -43,11 +44,11 @@ cask 'microsoft-office-ja' do
                          '~/Documents/Microsoft ユーザー データ/Microsoft',
                          '~/Documents/Microsoft ユーザー データ/Office 2011 Identities',
                          '~/Documents/Microsoft ユーザー データ/Outlook Sound Sets',
-                           '~/Documents/Microsoft ユーザー データ/Saved Attachments'
+                          '~/Documents/Microsoft ユーザー データ/Saved Attachments',
                        ],
            :rmdir   => [
                          '/Library/Application Support/Microsoft',
                          '~/Library/Application Support/Microsoft',
-                           '~/Documents/Microsoft ユーザー データ'
+                          '~/Documents/Microsoft ユーザー データ',
                        ]
 end
--- a/Casks/omnifocus-beta.rb
+++ b/Casks/omnifocus-beta.rb
@ -13,6 +13,6 @@ cask 'omnifocus-beta' do
                   '~/Library/containers/com.omnigroup.omnifocus2',
                   '~/Library/Preferences/com.omnigroup.OmniFocus2.LSSharedFileList.plist',
                   '~/Library/Preferences/com.omnigroup.OmniSoftwareUpdate.plist',
-                  '~/Library/Caches/Metadata/com.omnigroup.OmniFocus2'
+                   '~/Library/Caches/Metadata/com.omnigroup.OmniFocus2',
                 ]
 end
--- a/Casks/omnipresence-beta.rb
+++ b/Casks/omnipresence-beta.rb
@ -7,7 +7,7 @@ cask 'omnipresence-beta' do
  homepage 'https://www.omnigroup.com/omnipresence'
  license :commercial

-  app 'OmniPresence.app'
-
  depends_on :macos => '>= :yosemite'
+
+  app 'OmniPresence.app'
 end
--- a/Casks/openemu-experimental.rb
+++ b/Casks/openemu-experimental.rb
@ -40,6 +40,6 @@ cask 'openemu-experimental' do
                   '~/Library/Preferences/org.openemu.TwoMbit.plist',
                   '~/Library/Preferences/org.openemu.VecXGL.plist',
                   '~/Library/Preferences/org.openemu.VisualBoyAdvance.plist',
-                  '~/Library/Saved Application State/org.openemu.OpenEmu.savedState'
+                   '~/Library/Saved Application State/org.openemu.OpenEmu.savedState',
                 ]
 end
--- a/Casks/opera-beta.rb
+++ b/Casks/opera-beta.rb
@ -3,9 +3,9 @@ cask 'opera-beta' do
  sha256 '6f20c576e2920b8e821cea4efd0138966ae34d17fbf51bae9e6cbc2d3c2941e9'

  url "https://get.geo.opera.com/pub/opera-beta/#{version}/mac/Opera_beta_#{version}_Setup.dmg"
-  name "Opera Beta"
+  name 'Opera Beta'
  homepage 'http://www.opera.com/computer/beta'
-  license :unknown
+  license :unknown # TODO: change license and remove this comment; ':unknown' is a machine-generated placeholder

  app 'Opera Beta.app'
 end
--- a/Casks/opera-developer.rb
+++ b/Casks/opera-developer.rb
@ -3,9 +3,9 @@ cask 'opera-developer' do
  sha256 '0190c061ee2e0bb59830e064a893838d90f7148cce9a886ca0935363da98594f'

  url "https://get.geo.opera.com/pub/opera-developer/#{version}/mac/Opera_Developer_#{version}_Setup.dmg"
-  name "Opera Developer"
+  name 'Opera Developer'
  homepage 'http://www.opera.com/developer'
-  license :unknown
+  license :unknown # TODO: change license and remove this comment; ':unknown' is a machine-generated placeholder

  app 'Opera Developer.app'
 end
--- a/Casks/parallels10.rb
+++ b/Casks/parallels10.rb
@ -2,7 +2,7 @@ cask 'parallels10' do
  version '10.3.0-29227'
  sha256 '71654e1c7f311d9c95f4b78686ebcfcbbb8006fcb57cab39ac817b50c6eed2e3'

-  url "http://download.parallels.com/desktop/v#{version[/^\w+/]}/#{version.sub(/-.*$/, '')}/ParallelsDesktop-#{version}.dmg"
+  url "http://download.parallels.com/desktop/v#{version[%r{^\w+}]}/#{version.sub(%r{-.*$}, '')}/ParallelsDesktop-#{version}.dmg"
  name 'Parallels Desktop'
  homepage 'https://www.parallels.com/products/desktop/'
  license :commercial
@ -21,6 +21,7 @@ cask 'parallels10' do
                         '/usr/bin/prlctl',
                         '/usr/bin/prlsrvctl',
                       ]
+
  zap       :delete => [
                         '~/.parallels_settings',
                         '~/Library/Caches/com.parallels.desktop.console',
--- a/Casks/phpstorm-eap.rb
+++ b/Casks/phpstorm-eap.rb
@ -17,5 +17,4 @@ cask 'phpstorm-eap' do
                   '~/Library/Preferences/com.jetbrains.PhpStorm-EAP.plist',
                   '~/.WebIde100',
                 ]
-
 end
--- a/Casks/pycharm-ce-eap.rb
+++ b/Casks/pycharm-ce-eap.rb
@ -7,6 +7,8 @@ cask 'pycharm-ce-eap' do
  homepage 'https://confluence.jetbrains.com/display/PYH/JetBrains+PyCharm+Preview+(EAP)'
  license :apache

+  conflicts_with :cask => 'pycharm-ce'
+
  app 'PyCharm CE.app'

  zap :delete => [
@ -17,6 +19,4 @@ cask 'pycharm-ce-eap' do
                   '~/Library/Logs/PyCharm50',
                   '/usr/local/bin/charm',
                 ]
-
-  conflicts_with :cask => 'pycharm-ce'
 end
--- a/Casks/pycharm-eap.rb
+++ b/Casks/pycharm-eap.rb
@ -7,6 +7,8 @@ cask 'pycharm-eap' do
  homepage 'https://confluence.jetbrains.com/display/PYH/JetBrains+PyCharm+Preview+(EAP)'
  license :commercial

+  conflicts_with :cask => 'pycharm'
+
  app 'PyCharm.app'

  zap :delete => [
@ -17,6 +19,4 @@ cask 'pycharm-eap' do
                   '~/Library/Logs/PyCharm50',
                   '/usr/local/bin/charm',
                 ]
-
-  conflicts_with :cask => 'pycharm'
 end
--- a/Casks/royal-tsx-beta.rb
+++ b/Casks/royal-tsx-beta.rb
@ -3,9 +3,9 @@ cask 'royal-tsx-beta' do
  sha256 'abcf55a65d4ffcee7fe90d12ffc26c6f186b1a257b47aa7df6a7290d18c775c3'

  url "http://v2.royaltsx.com/updates/royaltsx_#{version}.dmg"
-  name 'Royal TSX'
  appcast 'http://v2.royaltsx.com/updates_beta.php',
          :checkpoint => 'f5a30300841e66f37005c35d327498682477c3cf3024bd850af9dd2af7fcd8ec'
+  name 'Royal TSX'
  homepage 'http://www.royaltsx.com'
  license :freemium

--- a/Casks/scansnap-manager-s1300.rb
+++ b/Casks/scansnap-manager-s1300.rb
@ -7,9 +7,9 @@ cask 'scansnap-manager-s1300' do
  homepage 'https://www.fujitsu.com/global/support/computing/peripheral/scanners/software/s1300m-setup.html'
  license :gratis

+  depends_on :macos => '>= :tiger'
+
  pkg 'Scansnap Manager.pkg'

  uninstall :pkgutil => 'jp.co.pfu.ScanSnap.V10L10'
-
-  depends_on :macos => '>= :tiger'
 end
--- a/Casks/scansnap-manager-s300m-s500m-s510m-fi-5110eoxm-legacy.rb
+++ b/Casks/scansnap-manager-s300m-s500m-s510m-fi-5110eoxm-legacy.rb
@ -7,9 +7,9 @@ cask 'scansnap-manager-s300m-s500m-s510m-fi-5110eoxm-legacy' do
  homepage 'https://www.fujitsu.com/global/support/computing/peripheral/scanners/software/mac.html'
  license :gratis

-  pkg 'ScanSnap_V22L11.pkg'
+  depends_on :macos => [:tiger, :leopard]

-  caveats "Install cask `scansnap-manager-s300m-s510m` after to update for compatibility with OS X 10.6+"
+  pkg 'ScanSnap_V22L11.pkg'

  uninstall :pkgutil => 'jp.co.pfu.ScanSnap.V10L10',
            :quit    => [
@ -23,8 +23,8 @@ cask 'scansnap-manager-s300m-s500m-s510m-fi-5110eoxm-legacy' do
                          'jp.co.pfu.ScanSnap.STPPDE',
                          'jp.co.pfu.ScanSnap.Scan2Mail',
                          'jp.co.pfu.ScanSnap.ScanToFolder',
-              'jp.co.pfu.ScanSnap.V10L10'
+                          'jp.co.pfu.ScanSnap.V10L10',
                        ]

-  depends_on :macos => [:tiger, :leopard]
+  caveats 'Install cask `scansnap-manager-s300m-s510m` after to update for compatibility with OS X 10.6+'
 end
--- a/Casks/scansnap-manager-s300m-s510m.rb
+++ b/Casks/scansnap-manager-s300m-s510m.rb
@ -7,6 +7,9 @@ cask 'scansnap-manager-s300m-s510m' do
  homepage 'https://www.fujitsu.com/global/support/computing/peripheral/scanners/software/mac-mg22-eol.html'
  license :gratis

+  depends_on :cask => 'scansnap-manager-s300m-s500m-s510m-fi-5110eoxm-legacy'
+  depends_on :macos => '>= :snow_leopard'
+
  pkg 'ScanSnap_V22L16.pkg'

  uninstall :pkgutil => 'jp.co.pfu.ScanSnap.V22L16',
@ -21,9 +24,6 @@ cask 'scansnap-manager-s300m-s510m' do
                          'jp.co.pfu.ScanSnap.STPPDE',
                          'jp.co.pfu.ScanSnap.Scan2Mail',
                          'jp.co.pfu.ScanSnap.ScanToFolder',
-              'jp.co.pfu.ScanSnap.V10L10'
+                          'jp.co.pfu.ScanSnap.V10L10',
                        ]
-
-  depends_on :cask => 'scansnap-manager-s300m-s500m-s510m-fi-5110eoxm-legacy'
-  depends_on :macos => '>= :snow_leopard'
 end
--- a/Casks/scansnap-manager-sv600.rb
+++ b/Casks/scansnap-manager-sv600.rb
@ -3,13 +3,13 @@ cask 'scansnap-manager-sv600' do
  sha256 '7273034398e9a57eb0fa89167c9e801ad2bf9fe56b52b3d9591628e978168afb'

  url "https://www.fujitsu.com/downloads/IMAGE/driver/ss/mgr/m-sv600/MacScanSnapV#{version.gsub('.', '')}WW.dmg"
-  name "ScanSnap Manager for Fujitsu ScanSnap SV600"
+  name 'ScanSnap Manager for Fujitsu ScanSnap SV600'
  homepage 'https://www.fujitsu.com/global/support/computing/peripheral/scanners/software/'
  license :gratis

+  depends_on :macos => '>= :lion'
+
  pkg 'ScanSnap Manager.pkg'

  uninstall :pkgutil => 'jp.co.pfu.ScanSnap.*'
-
-  depends_on :macos => '>= :lion'
 end
--- a/Casks/sketchup-pro.rb
+++ b/Casks/sketchup-pro.rb
@ -7,7 +7,7 @@ cask 'sketchup-pro' do
  url 'https://dl.trimble.com/sketchup/SketchUpPro-en.dmg'
  name 'SketchUp'
  homepage 'https://www.sketchup.com/intl/en/'
-  license :unknown    # todo: change license and remove this comment; ':unknown' is a machine-generated placeholder
+  license :unknown # TODO: change license and remove this comment; ':unknown' is a machine-generated placeholder

  suite 'SketchUp 2016'

--- a/Casks/sublime-text-dev.rb
+++ b/Casks/sublime-text-dev.rb
@ -10,6 +10,8 @@ cask 'sublime-text-dev' do
  homepage 'https://www.sublimetext.com/3dev'
  license :closed

+  conflicts_with :cask => 'caskroom/versions/sublime-text3'
+
  app 'Sublime Text.app'
  binary 'Sublime Text.app/Contents/SharedSupport/bin/subl'

@ -19,11 +21,9 @@ cask 'sublime-text-dev' do
                   '~/Library/Application Support/Sublime Text 3',
                   '~/Library/Caches/com.sublimetext.3',
                   '~/Library/Preferences/com.sublimetext.3.plist',
-                  '~/Library/Saved Application State/com.sublimetext.3.savedState'
+                   '~/Library/Saved Application State/com.sublimetext.3.savedState',
                 ]

-  conflicts_with :cask => 'caskroom/versions/sublime-text3'
-
  caveats do
    files_in_usr_local
  end
--- a/Casks/sublime-text3.rb
+++ b/Casks/sublime-text3.rb
@ -10,6 +10,8 @@ cask 'sublime-text3' do
  homepage 'https://www.sublimetext.com/3'
  license :closed

+  conflicts_with :cask => 'caskroom/versions/sublime-text-dev'
+
  app 'Sublime Text.app'
  binary 'Sublime Text.app/Contents/SharedSupport/bin/subl'

@ -19,11 +21,9 @@ cask 'sublime-text3' do
                   '~/Library/Application Support/Sublime Text 3',
                   '~/Library/Caches/com.sublimetext.3',
                   '~/Library/Preferences/com.sublimetext.3.plist',
-                  '~/Library/Saved Application State/com.sublimetext.3.savedState'
+                   '~/Library/Saved Application State/com.sublimetext.3.savedState',
                 ]

-  conflicts_with :cask => 'caskroom/versions/sublime-text-dev'
-
  caveats do
    files_in_usr_local
  end
--- a/Casks/torbrowser-alpha.rb
+++ b/Casks/torbrowser-alpha.rb
@ -3,11 +3,11 @@ cask 'torbrowser-alpha' do
  sha256 '1cc6b9316b2ca9246e15ff5489d0d2536b8e2e38efd87e4c24ffad2b2950a428'

  url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_en-US.dmg"
-  gpg "#{url}.asc",
-      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'
  name 'Tor Browser'
  homepage 'https://www.torproject.org/projects/torbrowser.html'
  license :oss
+  gpg "#{url}.asc",
+      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'

  app 'TorBrowser.app'

--- a/Casks/torbrowser-ar.rb
+++ b/Casks/torbrowser-ar.rb
@ -3,11 +3,11 @@ cask 'torbrowser-ar' do
  sha256 'e158d7350fb832db5ced52467e0483282bceba2bb9df37359340040123311326'

  url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_ar.dmg"
-  gpg "#{url}.asc",
-      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'
  name 'Tor Browser'
  homepage 'https://www.torproject.org/projects/torbrowser.html'
  license :oss
+  gpg "#{url}.asc",
+      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'

  app 'TorBrowser.app'
 end
--- a/Casks/torbrowser-cn.rb
+++ b/Casks/torbrowser-cn.rb
@ -3,11 +3,11 @@ cask 'torbrowser-cn' do
  sha256 'a1e0d85b2ed42fa622520873882d166cb13a968e868de8a65e086e3c61b207c0'

  url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_zh-CN.dmg"
-  gpg "#{url}.asc",
-      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'
  name 'Tor Browser'
  homepage 'https://www.torproject.org/projects/torbrowser.html'
  license :oss
+  gpg "#{url}.asc",
+      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'

  app 'TorBrowser.app'
 end
--- a/Casks/torbrowser-de.rb
+++ b/Casks/torbrowser-de.rb
@ -3,11 +3,11 @@ cask 'torbrowser-de' do
  sha256 '84f4c22558bb3d41955f326cc8cfb82b4774304ec2cab2f142b6443e72320cf8'

  url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_de.dmg"
-  gpg "#{url}.asc",
-      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'
  name 'Tor Browser'
  homepage 'https://www.torproject.org/projects/torbrowser.html'
  license :oss
+  gpg "#{url}.asc",
+      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'

  app 'TorBrowser.app'
 end
--- a/Casks/torbrowser-es.rb
+++ b/Casks/torbrowser-es.rb
@ -3,11 +3,11 @@ cask 'torbrowser-es' do
  sha256 '3d293c4b5f093b39e68e35a1c9083f12aab35d6c22f90a38a4760d6b178d4e85'

  url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_es-ES.dmg"
-  gpg "#{url}.asc",
-      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'
  name 'Tor Browser'
  homepage 'https://www.torproject.org/projects/torbrowser.html'
  license :oss
+  gpg "#{url}.asc",
+      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'

  app 'TorBrowser.app'
 end
--- a/Casks/torbrowser-fa.rb
+++ b/Casks/torbrowser-fa.rb
@ -3,11 +3,11 @@ cask 'torbrowser-fa' do
  sha256 'd7c266358dbfbef5f91db15addf011bcb6eb0f269ee917c8f38ad3d45431a8f1'

  url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_fa.dmg"
-  gpg "#{url}.asc",
-      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'
  name 'Tor Browser'
  homepage 'https://www.torproject.org/projects/torbrowser.html'
  license :oss
+  gpg "#{url}.asc",
+      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'

  app 'TorBrowser.app'
 end
--- a/Casks/torbrowser-fr.rb
+++ b/Casks/torbrowser-fr.rb
@ -3,11 +3,11 @@ cask 'torbrowser-fr' do
  sha256 'b7cde0c92bdfb97fbd686e89009c5dd9ccfa5ec5cd3b5522465ba5d43623a6c8'

  url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_fr.dmg"
-  gpg "#{url}.asc",
-      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'
  name 'Tor Browser'
  homepage 'https://www.torproject.org/projects/torbrowser.html'
  license :oss
+  gpg "#{url}.asc",
+      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'

  app 'TorBrowser.app'
 end
--- a/Casks/torbrowser-it.rb
+++ b/Casks/torbrowser-it.rb
@ -3,11 +3,11 @@ cask 'torbrowser-it' do
  sha256 'a88a51afbfb7e86d229009302754a066a141a74a97c84054b99db1b0b7a208b5'

  url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_it.dmg"
-  gpg "#{url}.asc",
-      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'
  name 'Tor Browser'
  homepage 'https://www.torproject.org/projects/torbrowser.html'
  license :oss
+  gpg "#{url}.asc",
+      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'

  app 'TorBrowser.app'
 end
--- a/Casks/torbrowser-ko.rb
+++ b/Casks/torbrowser-ko.rb
@ -3,11 +3,11 @@ cask 'torbrowser-ko' do
  sha256 '80036233651b7b273e48d3a5afd675663ca67cc905d3417904ce837901403325'

  url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_ko.dmg"
-  gpg "#{url}.asc",
-      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'
  name 'Tor Browser'
  homepage 'https://www.torproject.org/projects/torbrowser.html'
  license :oss
+  gpg "#{url}.asc",
+      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'

  app 'TorBrowser.app'
 end
--- a/Casks/torbrowser-nl.rb
+++ b/Casks/torbrowser-nl.rb
@ -3,11 +3,11 @@ cask 'torbrowser-nl' do
  sha256 '114d63966962b9a865cef607dc65315bb1a18f61eba7b019ec603c85393c3cf7'

  url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_nl.dmg"
-  gpg "#{url}.asc",
-      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'
  name 'Tor Browser'
  homepage 'https://www.torproject.org/projects/torbrowser.html'
  license :oss
+  gpg "#{url}.asc",
+      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'

  app 'TorBrowser.app'
 end
--- a/Casks/torbrowser-pl.rb
+++ b/Casks/torbrowser-pl.rb
@ -3,11 +3,11 @@ cask 'torbrowser-pl' do
  sha256 'c87905e4dcb4bd2b417b7fcf3c0ca47d4eb7168eef08c7a413ed839061fd8397'

  url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_pl.dmg"
-  gpg "#{url}.asc",
-      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'
  name 'Tor Browser'
  homepage 'https://www.torproject.org/projects/torbrowser.html'
  license :oss
+  gpg "#{url}.asc",
+      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'

  app 'TorBrowser.app'
 end
--- a/Casks/torbrowser-pt.rb
+++ b/Casks/torbrowser-pt.rb
@ -3,11 +3,11 @@ cask 'torbrowser-pt' do
  sha256 '8ee3d70088093cd64e41f2c5531e6f5bc73bfa346083c8340ef8db08508f03d9'

  url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_pt-PT.dmg"
-  gpg "#{url}.asc",
-      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'
  name 'Tor Browser'
  homepage 'https://www.torproject.org/projects/torbrowser.html'
  license :oss
+  gpg "#{url}.asc",
+      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'

  app 'TorBrowser.app'
 end
--- a/Casks/torbrowser-ru.rb
+++ b/Casks/torbrowser-ru.rb
@ -3,11 +3,11 @@ cask 'torbrowser-ru' do
  sha256 '6f1397ce060cbd7130452a5a0e1031c07452a14f54cadab5375f150033756226'

  url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_ru.dmg"
-  gpg "#{url}.asc",
-      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'
  name 'Tor Browser'
  homepage 'https://www.torproject.org/projects/torbrowser.html'
  license :oss
+  gpg "#{url}.asc",
+      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'

  app 'TorBrowser.app'
 end
--- a/Casks/torbrowser-tr.rb
+++ b/Casks/torbrowser-tr.rb
@ -3,11 +3,11 @@ cask 'torbrowser-tr' do
  sha256 '6cd4dede3b0d90169437a2b4874a98f2122902bdc054f4ba3f6eb19b05b9288e'

  url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_tr.dmg"
-  gpg "#{url}.asc",
-      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'
  name 'Tor Browser'
  homepage 'https://www.torproject.org/projects/torbrowser.html'
  license :oss
+  gpg "#{url}.asc",
+      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'

  app 'TorBrowser.app'
 end
--- a/Casks/torbrowser-vi.rb
+++ b/Casks/torbrowser-vi.rb
@ -3,11 +3,11 @@ cask 'torbrowser-vi' do
  sha256 'b25ef10c19b409bdd5e1ecb2a705b21656f50b345e5672aaf04dba519b238e71'

  url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_vi.dmg"
-  gpg "#{url}.asc",
-      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'
  name 'Tor Browser'
  homepage 'https://www.torproject.org/projects/torbrowser.html'
  license :oss
+  gpg "#{url}.asc",
+      :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290'

  app 'TorBrowser.app'
 end
--- a/Casks/transmission-nightly.rb
+++ b/Casks/transmission-nightly.rb
@ -14,6 +14,6 @@ cask 'transmission-nightly' do
                   '~/Library/Preferences/org.m0k.transmission.plist',
                   '~/Library/Preferences/org.m0k.transmission.LSSharedFileList.plist',
                   '~/Library/Caches/org.m0k.transmission',
-                  '~/Library/Saved Application State/org.m0k.transmission.savedState'
+                   '~/Library/Saved Application State/org.m0k.transmission.savedState',
                 ]
 end
--- a/Casks/tunnelblick-beta.rb
+++ b/Casks/tunnelblick-beta.rb
@ -9,13 +9,13 @@ cask 'tunnelblick-beta' do
  homepage 'https://tunnelblick.net'
  license :gpl

+  depends_on :macos => '>= :tiger'
+
  app 'Tunnelblick.app'

  uninstall :launchctl => 'net.tunnelblick.tunnelblick.LaunchAtLogin',
            :quit      => 'net.tunnelblick.tunnelblick'

-  depends_on :macos => '>= :tiger'
-
  caveats <<-EOS.undent
    For security reasons, #{token} must be installed to /Applications,
    and will request to be moved at launch.
--- a/Casks/utorrent-beta.rb
+++ b/Casks/utorrent-beta.rb
@ -7,6 +7,8 @@ cask 'utorrent-beta' do
  homepage 'https://www.utorrent.com/'
  license :freemium

+  app 'uTorrent.app'
+
  zap :delete => [
                   '~/Library/Application Support/uTorrent',
                   '~/Library/Preferences/com.bittorrent.uTorrent.plist',
@ -14,8 +16,6 @@ cask 'utorrent-beta' do
                   '~/Library/Saved Application State/com.bittorrent.uTorrent.savedState',
                   '~/Library/Saved Application State/com.bittorrent.uTorrent-Installer.savedState',
                   '~/Library/Caches/com.bittorrent.uTorrent',
-                  '~/Library/Caches/com.bittorrent.uTorrent-Installer'
+                   '~/Library/Caches/com.bittorrent.uTorrent-Installer',
                 ]
-
-  app 'uTorrent.app'
 end
--- a/Casks/vmware-fusion6.rb
+++ b/Casks/vmware-fusion6.rb
@ -7,8 +7,8 @@ cask 'vmware-fusion6' do
  homepage 'https://www.vmware.com/products/fusion/'
  license :commercial

-  binary 'VMware Fusion.app/Contents/Library/vmrun'
  app 'VMware Fusion.app'
+  binary 'VMware Fusion.app/Contents/Library/vmrun'

  uninstall_preflight do
    system '/usr/bin/sudo', '-E', '--',
--- a/Casks/vmware-fusion7.rb
+++ b/Casks/vmware-fusion7.rb
@ -7,12 +7,12 @@ cask 'vmware-fusion7' do
  homepage 'https://www.vmware.com/products/fusion/'
  license :commercial

+  app 'VMware Fusion.app'
  binary 'VMware Fusion.app/Contents/Library/vmnet-cfgcli'
  binary 'VMware Fusion.app/Contents/Library/vmnet-cli'
  binary 'VMware Fusion.app/Contents/Library/vmrun'
  binary 'VMware Fusion.app/Contents/Library/vmware-vdiskmanager'
  binary 'VMware Fusion.app/Contents/Library/VMware OVF Tool/ovftool'
-  app 'VMware Fusion.app'

  uninstall_preflight do
    set_ownership "#{staged_path}/VMware Fusion.app"
--- a/Casks/wimoweh-beta.rb
+++ b/Casks/wimoweh-beta.rb
@ -5,7 +5,7 @@ cask 'wimoweh-beta' do
  url "https://www.serialangels.co.uk/sa-content/uploads/2015/08/Wimoweh.#{version}_.zip"
  name 'Wimoweh'
  homepage 'http://www.serialangels.co.uk/index.php/wimoweh/'
-  license :unknown
+  license :unknown # TODO: change license and remove this comment; ':unknown' is a machine-generated placeholder

  app 'Wimoweh.app'
 end
--- a/Casks/xquartz-beta.rb
+++ b/Casks/xquartz-beta.rb
@ -29,6 +29,7 @@ cask 'xquartz-beta' do
            :launchctl => 'org.macosforge.xquartz.*',
            :pkgutil   => 'org.macosforge.xquartz.pkg',
            :delete    => '/opt/X11/'
+
  zap       :delete => [
                         '~/Library/Caches/org.macosforge.xquartz.X11',
                         '~/Library/Logs/X11',