From 1c71c162255d7fec40fed06bf70ab793a4ee6c45 Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Tue, 21 Oct 2014 09:20:10 -0400 Subject: [PATCH 01/21] use installer :manual in adobe-creative-cloud --- Casks/adobe-creative-cloud.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Casks/adobe-creative-cloud.rb b/Casks/adobe-creative-cloud.rb index b77026e5756d0..ff58990095c27 100644 --- a/Casks/adobe-creative-cloud.rb +++ b/Casks/adobe-creative-cloud.rb @@ -6,7 +6,5 @@ class AdobeCreativeCloud < Cask homepage 'https://creative.adobe.com/products/creative-cloud' license :commercial - caveats do - manual_installer 'Creative Cloud Installer.app' - end + installer :manual => 'Creative Cloud Installer.app' end From f8f53e3539d5b27a20e7aaa7d089a51f9943bd18 Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Tue, 21 Oct 2014 09:20:10 -0400 Subject: [PATCH 02/21] use installer :manual in backblaze --- Casks/backblaze.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Casks/backblaze.rb b/Casks/backblaze.rb index 7459974baf278..bdc15067b62b4 100644 --- a/Casks/backblaze.rb +++ b/Casks/backblaze.rb @@ -6,7 +6,5 @@ class Backblaze < Cask homepage 'https://www.backblaze.com/' license :commercial - caveats do - manual_installer 'Backblaze Installer.app' - end + installer :manual => 'Backblaze Installer.app' end From 75b2b79c9323ebb71cbc0a592547463cb1b77cc3 Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Tue, 21 Oct 2014 09:20:10 -0400 Subject: [PATCH 03/21] use installer :manual in baiduinput --- Casks/baiduinput.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Casks/baiduinput.rb b/Casks/baiduinput.rb index d1997a36bb6d7..1c7597485a5b4 100644 --- a/Casks/baiduinput.rb +++ b/Casks/baiduinput.rb @@ -7,10 +7,8 @@ class Baiduinput < Cask homepage 'http://wuxian.baidu.com/input/mac.html' license :gratis + installer :manual => '安装百度输入法.app' + uninstall :pkgutil => 'com.baidu.inputmethod.*', :delete => '/Library/Input Methods/BaiduIM.app' - - caveats do - manual_installer '安装百度输入法.app' - end end From ed988ca987b57cd7b892bbb15b1d1a8436a86c29 Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Tue, 21 Oct 2014 09:20:10 -0400 Subject: [PATCH 04/21] use installer :manual in dbvisualizer --- Casks/dbvisualizer.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Casks/dbvisualizer.rb b/Casks/dbvisualizer.rb index 5860093646be8..d64e691f63740 100644 --- a/Casks/dbvisualizer.rb +++ b/Casks/dbvisualizer.rb @@ -6,7 +6,5 @@ class Dbvisualizer < Cask homepage 'http://www.dbvis.com/' license :commercial - caveats do - manual_installer('DbVisualizer Installer.app') - end + installer :manual => 'DbVisualizer Installer.app' end From 64239bb7d5e904f8c6bedfe10a414427b9d38fac Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Tue, 21 Oct 2014 09:20:10 -0400 Subject: [PATCH 05/21] use installer :manual in default-folder-x --- Casks/default-folder-x.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Casks/default-folder-x.rb b/Casks/default-folder-x.rb index 1bc33786dada6..25d3a62efc479 100644 --- a/Casks/default-folder-x.rb +++ b/Casks/default-folder-x.rb @@ -6,13 +6,11 @@ class DefaultFolderX < Cask homepage 'http://www.stclairsoft.com/DefaultFolderX' license :unknown + installer :manual => 'Default Folder X Installer.app' + zap :delete => [ '~/Library/Preferences/com.stclairsoft.DefaultFolderX.favorites.plist', '~/Library/Preferences/com.stclairsoft.DefaultFolderX.plist', '~/Library/Preferences/com.stclairsoft.DefaultFolderX.settings.plist', ] - - caveats do - manual_installer 'Default Folder X Installer.app' - end end From b336e15597a0ef7047a85431f09af226ee4de66b Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Tue, 21 Oct 2014 09:20:10 -0400 Subject: [PATCH 06/21] use installer :manual in google-nik-collection --- Casks/google-nik-collection.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Casks/google-nik-collection.rb b/Casks/google-nik-collection.rb index 5420c74da7c03..001a1b5ce2ee1 100644 --- a/Casks/google-nik-collection.rb +++ b/Casks/google-nik-collection.rb @@ -6,7 +6,5 @@ class GoogleNikCollection < Cask homepage 'https://www.google.com/nikcollection/' license :unknown - caveats do - manual_installer 'Nik Collection.app' - end + installer :manual => 'Nik Collection.app' end From 7a15e5edffb961cb6dded638abda9a44b13ba8c8 Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Tue, 21 Oct 2014 09:20:10 -0400 Subject: [PATCH 07/21] use installer :manual in jdownloader --- Casks/jdownloader.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Casks/jdownloader.rb b/Casks/jdownloader.rb index 8c510f8020066..504b3681ac760 100644 --- a/Casks/jdownloader.rb +++ b/Casks/jdownloader.rb @@ -6,7 +6,5 @@ class Jdownloader < Cask homepage 'http://jdownloader.org/' license :unknown - caveats do - manual_installer 'JDownloader Installer.app' - end + installer :manual => 'JDownloader Installer.app' end From 5cd836d0d935b24d38d0ae7a1353f276e2492b38 Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Tue, 21 Oct 2014 09:20:10 -0400 Subject: [PATCH 08/21] use installer :manual in little-snitch --- Casks/little-snitch.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Casks/little-snitch.rb b/Casks/little-snitch.rb index e48a351fc12d6..4a10568b84ed8 100644 --- a/Casks/little-snitch.rb +++ b/Casks/little-snitch.rb @@ -6,14 +6,12 @@ class LittleSnitch < Cask homepage 'http://www.obdev.at/products/littlesnitch/index.html' license :unknown + installer :manual => 'Little Snitch Installer.app' + zap :delete => [ '~/Library/Preferences/at.obdev.LittleSnitchNetworkMonitor.plist', '~/Library/Application Support/Little Snitch/rules.usr.xpl', '~/Library/Application Support/Little Snitch/configuration.xpl', '~/Library/Application Support/Little Snitch/configuration.user.xpl', ] - - caveats do - manual_installer 'Little Snitch Installer.app' - end end From 2310882aca9b49ad023ebcce6fb170d3d452c9ae Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Tue, 21 Oct 2014 09:20:10 -0400 Subject: [PATCH 09/21] use installer :manual in logmein-hamachi --- Casks/logmein-hamachi.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Casks/logmein-hamachi.rb b/Casks/logmein-hamachi.rb index a9da8a689bf67..bb670b1553974 100644 --- a/Casks/logmein-hamachi.rb +++ b/Casks/logmein-hamachi.rb @@ -6,7 +6,5 @@ class LogmeinHamachi < Cask homepage 'http://vpn.net' license :unknown - caveats do - manual_installer 'LogMeInHamachiInstaller.app' - end + installer :manual => 'LogMeInHamachiInstaller.app' end From f3a9652d73517fca4948f77ad0daec1b1355ccd4 Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Tue, 21 Oct 2014 09:20:10 -0400 Subject: [PATCH 10/21] use installer :manual in paye-tools --- Casks/paye-tools.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Casks/paye-tools.rb b/Casks/paye-tools.rb index ec850ac26aaca..21265fa33406f 100644 --- a/Casks/paye-tools.rb +++ b/Casks/paye-tools.rb @@ -6,7 +6,5 @@ class PayeTools < Cask homepage 'http://www.hmrc.gov.uk/payerti/payroll/bpt/paye-tools.htm' license :unknown - caveats do - manual_installer "payetools-rti-#{version}-osx.app" - end + installer :manual => "payetools-rti-#{version}-osx.app" end From 835f7a511361cc7e65a13f41261e1fc65daa7cf3 Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Tue, 21 Oct 2014 09:20:10 -0400 Subject: [PATCH 11/21] use installer :manual in ps3-media-server --- Casks/ps3-media-server.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Casks/ps3-media-server.rb b/Casks/ps3-media-server.rb index 1d7b4defae94c..f11c301af714a 100644 --- a/Casks/ps3-media-server.rb +++ b/Casks/ps3-media-server.rb @@ -6,7 +6,5 @@ class Ps3MediaServer < Cask homepage 'http://www.ps3mediaserver.org/' license :oss - caveats do - manual_installer 'PS3 Media Server Setup.app' - end + installer :manual => 'PS3 Media Server Setup.app' end From a9448b55c26c297b892efbccdef7dff2cca920cd Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Tue, 21 Oct 2014 09:20:11 -0400 Subject: [PATCH 12/21] use installer :manual in scout --- Casks/scout.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Casks/scout.rb b/Casks/scout.rb index 2b8390d0dd056..225aea622f4c2 100644 --- a/Casks/scout.rb +++ b/Casks/scout.rb @@ -6,7 +6,5 @@ class Scout < Cask homepage 'http://mhs.github.io/scout-app/' license :oss - caveats do - manual_installer 'Install Scout.app' - end + installer :manual => 'Install Scout.app' end From c9f93211f2954f39aadd0103a567ff13f1a316d9 Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Tue, 21 Oct 2014 09:20:11 -0400 Subject: [PATCH 13/21] use installer :manual in sogouinput --- Casks/sogouinput.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Casks/sogouinput.rb b/Casks/sogouinput.rb index 7ffc5b36ddece..d41586c1c51ad 100644 --- a/Casks/sogouinput.rb +++ b/Casks/sogouinput.rb @@ -7,9 +7,7 @@ class Sogouinput < Cask homepage 'http://pinyin.sogou.com/mac/' license :unknown - uninstall :delete => '/Library/Input Methods/SogouInput.app' + installer :manual => '安装搜狗输入法.app' - caveats do - manual_installer '安装搜狗输入法.app' - end + uninstall :delete => '/Library/Input Methods/SogouInput.app' end From a48618e133ce7a61a092406e9845e6900850afda Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Tue, 21 Oct 2014 09:20:11 -0400 Subject: [PATCH 14/21] use installer :manual in sts --- Casks/sts.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Casks/sts.rb b/Casks/sts.rb index 81b2da741b38e..faf79effde9d1 100644 --- a/Casks/sts.rb +++ b/Casks/sts.rb @@ -12,7 +12,5 @@ def self.based_on_eclipse homepage 'http://spring.io/tools/sts' license :unknown - caveats do - manual_installer "Installer - Spring Tool Suite #{version}.RELEASE.app" - end + installer :manual => "Installer - Spring Tool Suite #{version}.RELEASE.app" end From 6da52168c42514a187ea3948759cf8fca5ba49d7 Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Tue, 21 Oct 2014 09:20:11 -0400 Subject: [PATCH 15/21] use installer :manual in thinkorswim --- Casks/thinkorswim.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Casks/thinkorswim.rb b/Casks/thinkorswim.rb index 88c4db7903a26..6508d0b5c5a9d 100644 --- a/Casks/thinkorswim.rb +++ b/Casks/thinkorswim.rb @@ -6,7 +6,5 @@ class Thinkorswim < Cask homepage 'http://mediaserver.thinkorswim.com/installer/install.html#macosx' license :unknown - caveats do - manual_installer 'thinkorswim Installer.app' - end + installer :manual => 'thinkorswim Installer.app' end From e0a4aff5a10dce155e262e6b4b8057a5784caaa6 Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Tue, 21 Oct 2014 09:20:11 -0400 Subject: [PATCH 16/21] use installer :manual in titanium-studio --- Casks/titanium-studio.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Casks/titanium-studio.rb b/Casks/titanium-studio.rb index 312b10a794b09..578651e33458b 100644 --- a/Casks/titanium-studio.rb +++ b/Casks/titanium-studio.rb @@ -6,7 +6,5 @@ class TitaniumStudio < Cask homepage 'https://my.appcelerator.com/resources' license :unknown - caveats do - manual_installer 'Titanium Studio.app' - end + installer :manual => 'Titanium Studio.app' end From dc24c9df439dd050b629324fd670159c2cb2f18d Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Tue, 21 Oct 2014 09:20:11 -0400 Subject: [PATCH 17/21] use installer :manual in utorrent --- Casks/utorrent.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Casks/utorrent.rb b/Casks/utorrent.rb index c157b784cddb4..287d1edefa299 100644 --- a/Casks/utorrent.rb +++ b/Casks/utorrent.rb @@ -7,7 +7,5 @@ class Utorrent < Cask homepage 'http://www.utorrent.com/' license :unknown - caveats do - manual_installer 'uTorrent-Installer.app' - end + installer :manual => 'uTorrent-Installer.app' end From 1c94355b6f2a82a5efa762e9ffae39f96308a538 Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Tue, 21 Oct 2014 09:20:11 -0400 Subject: [PATCH 18/21] use installer :manual in vlc-remote --- Casks/vlc-remote.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Casks/vlc-remote.rb b/Casks/vlc-remote.rb index 9cc337f8fed71..b8370dd0808d7 100644 --- a/Casks/vlc-remote.rb +++ b/Casks/vlc-remote.rb @@ -7,7 +7,5 @@ class VlcRemote < Cask homepage 'http://hobbyistsoftware.com/vlc' license :unknown - caveats do - manual_installer 'VLC Setup.app' - end + installer :manual => 'VLC Setup.app' end From 6ba30a5f83c56e9cd7ca19fa12818a42084606ab Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Tue, 21 Oct 2014 09:20:11 -0400 Subject: [PATCH 19/21] use installer :manual in xamarin --- Casks/xamarin.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Casks/xamarin.rb b/Casks/xamarin.rb index d2b2c64514b88..d97e6574f50e2 100644 --- a/Casks/xamarin.rb +++ b/Casks/xamarin.rb @@ -6,11 +6,12 @@ class Xamarin < Cask homepage 'http://xamarin.com/platform' license :unknown + installer :manual => 'Install Xamarin.app' + uninstall :delete => '/Applications/Xamarin Studio.app' zap :delete => '~/Library/Developer/Xamarin' caveats do puts 'This app requires the JRE (Java Runtime Environment) to be installed' - manual_installer 'Install Xamarin.app' end end From 070c5f621b07b05f489d18453f4ac7c2c1a65a8f Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Tue, 21 Oct 2014 09:20:11 -0400 Subject: [PATCH 20/21] use installer :manual in xampp --- Casks/xampp.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Casks/xampp.rb b/Casks/xampp.rb index 5809ad3f6454a..810245d7b3751 100644 --- a/Casks/xampp.rb +++ b/Casks/xampp.rb @@ -6,7 +6,5 @@ class Xampp < Cask homepage 'http://www.apachefriends.org/index.html' license :oss - caveats do - manual_installer 'xampp-osx-1.8.3-3-installer.app' - end + installer :manual => 'xampp-osx-1.8.3-3-installer.app' end From a3320e6f8f10d6b4177de16682ca1a967d8f8f20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Galv=C3=A3o?= Date: Tue, 21 Oct 2014 15:34:59 +0100 Subject: [PATCH 21/21] use installer :manual in omnifocus-clip-o-tron.rb Downloaded and checked to clear the ambiguity. --- Casks/omnifocus-clip-o-tron.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Casks/omnifocus-clip-o-tron.rb b/Casks/omnifocus-clip-o-tron.rb index afd8ec00628ec..803b91397e62a 100644 --- a/Casks/omnifocus-clip-o-tron.rb +++ b/Casks/omnifocus-clip-o-tron.rb @@ -6,9 +6,5 @@ class OmnifocusClipOTron < Cask homepage 'http://support.omnigroup.com/omnifocus-clip-o-tron' license :unknown - app 'OmniFocus Clip-o-Tron.app' - - caveats do - manual_installer 'OmniFocus Clip-o-Tron.app' - end + installer :manual => 'OmniFocus Clip-o-Tron.app' end