From 04e2030c802fda896cbe7134633bdac0d50ff168 Mon Sep 17 00:00:00 2001 From: Josh Hagins Date: Sun, 3 Jan 2016 14:17:47 -0500 Subject: [PATCH] araxis-merge.rb: RuboCop (master), RuboCop-cask (master) auto-correct --- Casks/araxis-merge.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Casks/araxis-merge.rb b/Casks/araxis-merge.rb index 7b7005b21b1..c00ed74e4d4 100644 --- a/Casks/araxis-merge.rb +++ b/Casks/araxis-merge.rb @@ -1,7 +1,7 @@ cask 'araxis-merge' do version '2014.4581' - depends_on :macos => '>= :mavericks' + name 'Araxis Merge' if MacOS.release <= :mavericks sha256 '4029be850bbffd8a46b30b7701434474c33e07e678848ae47e094ddba04668d2' url "http://www.araxis.com/download/Merge#{version}-OSX10.9.dmg" @@ -10,12 +10,12 @@ cask 'araxis-merge' do url "http://www.araxis.com/download/Merge#{version}-OSX10.10.dmg" end - name 'Araxis Merge' homepage 'http://www.araxis.com/merge' license :commercial - app 'Araxis Merge.app' + depends_on :macos => '>= :mavericks' + app 'Araxis Merge.app' binary 'Utilities/araxisgitdiff' binary 'Utilities/araxisopendiff' binary 'Utilities/araxissvndiff' @@ -29,8 +29,8 @@ cask 'araxis-merge' do binary 'Utilities/araxissvnmerge' zap :delete => [ - '~/Library/Preferences/com.araxis.merge.LSSharedFileList.plist', - '~/Library/Preferences/com.araxis.merge.plist', + '~/Library/Preferences/com.araxis.merge.LSSharedFileList.plist', + '~/Library/Preferences/com.araxis.merge.plist', ] caveats <<-EOS.undent