From 167bfe11f5b3b2c6c097c6089b96c1b7e8bb7183 Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Wed, 3 Dec 2014 09:13:54 -0500 Subject: [PATCH 1/7] convert couleurs.rb to `depends_on :macos` from caveats `os_version_only`. --- Casks/couleurs.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Casks/couleurs.rb b/Casks/couleurs.rb index 69be2382e6..3b2c19bb9a 100644 --- a/Casks/couleurs.rb +++ b/Casks/couleurs.rb @@ -8,7 +8,5 @@ cask :v1 => 'couleurs' do app 'Couleurs.app' - caveats do - os_version_only '10.10' - end + depends_on :macos => '>= :yosemite' end From bd1960fb62ddaa1b96b4ae4356a13590b3758370 Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Wed, 3 Dec 2014 09:14:38 -0500 Subject: [PATCH 2/7] convert deeper.rb to `depends_on :macos` from caveats `os_version_only`. Also tweak unrelated version-specific caveat. --- Casks/deeper.rb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Casks/deeper.rb b/Casks/deeper.rb index 0894359ac2..d46105f8c7 100644 --- a/Casks/deeper.rb +++ b/Casks/deeper.rb @@ -23,11 +23,19 @@ cask :v1 => 'deeper' do app 'Deeper.app' - caveats do - os_version_only('10.4', '10.5', '10.6', '10.7', '10.8', '10.9', '10.10') + depends_on :macos => %w{ + :tiger + :leopard + :snow_leopard + :lion + :mountain_lion + :mavericks + :yosemite + } - if [:leopard, :tiger].include? MacOS.version - puts 'Deeper only runs from an Administrator account.' + caveats do + if [:leopard, :tiger].include?(MacOS.version.to_sym) + puts 'Deeper only runs from an Administrator account on this version of OS X.' end end end From c102d593803720d8a73bf7a9da2dc4fbb8aeec6f Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Wed, 3 Dec 2014 09:15:08 -0500 Subject: [PATCH 3/7] convert maintenance.rb to `depends_on :macos` from caveats `os_version_only`. Also tweak unrelated version-specific caveat. --- Casks/maintenance.rb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Casks/maintenance.rb b/Casks/maintenance.rb index d7b1967387..d58788f12e 100644 --- a/Casks/maintenance.rb +++ b/Casks/maintenance.rb @@ -23,11 +23,19 @@ cask :v1 => 'maintenance' do app 'Maintenance.app' - caveats do - os_version_only('10.4', '10.5', '10.6', '10.7', '10.8', '10.9', '10.10') + depends_on :macos => %w{ + :tiger + :leopard + :snow_leopard + :lion + :mountain_lion + :mavericks + :yosemite + } - if [:leopard, :tiger].include? MacOS.version - puts 'Maintenance only runs from an Administrator account.' + caveats do + if [:leopard, :tiger].include?(MacOS.version.to_sym) + puts 'Maintenance only runs from an Administrator account on this version of OS X.' end end end From 899e3d1231a017bfd6215c3e46e0c4b75c965c06 Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Wed, 3 Dec 2014 09:15:23 -0500 Subject: [PATCH 4/7] convert fenics.rb to `depends_on :macos` from caveats `os_version_only`. --- Casks/fenics.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Casks/fenics.rb b/Casks/fenics.rb index 89fb116e31..8215e90a90 100644 --- a/Casks/fenics.rb +++ b/Casks/fenics.rb @@ -8,8 +8,9 @@ cask :v1 => 'fenics' do app 'FEniCS.app' + depends_on :macos => '>= :mavericks' + caveats do - os_version_only '10.9', '10.10' <<-EOS.undent FEniCS is designed to work with the OS X system Python (v. 2.7.5 in OS X 10.9). From f38029a36b1ac4c98b21a02f4aa7198f7bccdd5a Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Wed, 3 Dec 2014 09:15:33 -0500 Subject: [PATCH 5/7] convert tunnelblick.rb to `depends_on :macos` from caveats `os_version_only`. --- Casks/tunnelblick.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Casks/tunnelblick.rb b/Casks/tunnelblick.rb index ffbdb6828a..274630cd4c 100644 --- a/Casks/tunnelblick.rb +++ b/Casks/tunnelblick.rb @@ -12,8 +12,9 @@ cask :v1 => 'tunnelblick' do uninstall :launchctl => 'net.tunnelblick.tunnelblick.LaunchAtLogin', :quit => 'net.tunnelblick.tunnelblick' + depends_on :macos => '>= :tiger' + caveats do - os_version_only *%w(10.4 10.5 10.6 10.7 10.8 10.9 10.10) <<-EOS.undent For security reasons, Tunnelblick must be installed to /Applications, and will request to be moved at launch. From cd66ea94e19a19868151edf84d4ba281ea0d7797 Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Wed, 3 Dec 2014 09:15:44 -0500 Subject: [PATCH 6/7] convert ubar.rb to `depends_on :macos` from caveats `os_version_only`. --- Casks/ubar.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Casks/ubar.rb b/Casks/ubar.rb index e0e3168c4c..15556ff4ce 100644 --- a/Casks/ubar.rb +++ b/Casks/ubar.rb @@ -7,7 +7,6 @@ cask :v1 => 'ubar' do license :unknown app 'uBar.app' - caveats do - os_version_only '10.9', '10.10' - end + + depends_on :macos => '>= :mavericks' end From c4122c05ad858f8c56e7a26410608d7237e548a3 Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Wed, 3 Dec 2014 09:15:55 -0500 Subject: [PATCH 7/7] convert zooom.rb to `depends_on :macos` from caveats `os_version_only`. --- Casks/zooom.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Casks/zooom.rb b/Casks/zooom.rb index 0d7da22257..b58d40d2e6 100644 --- a/Casks/zooom.rb +++ b/Casks/zooom.rb @@ -10,7 +10,5 @@ cask :v1 => 'zooom' do uninstall :pkgutil => 'com.coderage.pkg.Zooom2' - caveats do - os_version_only '10.9', '10.10' - end + depends_on :macos => '>= :mavericks' end