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 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 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). 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 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. 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 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