From 7a332cc271534d6b583ed7e96befa4503bbc0b7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Galv=C3=A3o?= Date: Mon, 26 Jan 2015 16:03:36 +0000 Subject: [PATCH 1/2] pandoc.rb: replaced caveats with conflicts_with --- Casks/pandoc.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Casks/pandoc.rb b/Casks/pandoc.rb index d23a17b3c66..a5f0b27f8b3 100644 --- a/Casks/pandoc.rb +++ b/Casks/pandoc.rb @@ -11,9 +11,6 @@ cask :v1 => 'pandoc' do pkg "pandoc-#{version}-osx.pkg" uninstall :pkgutil => 'net.johnmacfarlane.pandoc' - caveats <<-EOS.undent - Note that homebrew also provides a compiled pandoc Formula that links its - binary to /usr/local/bin/pandoc. It's not recommended to install both the - Cask and the Formula of Pandoc. - EOS + + conflicts_with :formula => 'pandoc' end From 386ed8751ec4ed11cd2df246160d71d2cfd7a61a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Galv=C3=A3o?= Date: Mon, 26 Jan 2015 16:03:36 +0000 Subject: [PATCH 2/2] macvim.rb: replaced caveats with conflicts_with --- Casks/macvim.rb | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Casks/macvim.rb b/Casks/macvim.rb index f14dcc322d7..a16e7d2ece8 100644 --- a/Casks/macvim.rb +++ b/Casks/macvim.rb @@ -24,12 +24,5 @@ cask :v1 => 'macvim' do '~/Library/Preferences/org.vim.MacVim.plist', ] - caveats do - files_in_usr_local - <<-EOS.undent - Note that homebrew also provides a compiled macvim Formula that links its - binary to /usr/local/bin/mvim. It's not recommended to install both the - Cask and the Formula of MacVim. - EOS - end + conflicts_with :formula => 'macvim' end