Merge pull request #14312 from bdhess/jdk-library

Fix for #14298
2015-10-12 17:31:49 +01:00 · 2015-10-12 17:31:49 +01:00 · 4f54e9e236
parent 5fd1a85fe2 4a5ae749c5
commit 4f54e9e236
1 changed files with 7 additions and 3 deletions
--- a/Casks/java.rb
+++ b/Casks/java.rb
@ -52,9 +52,13 @@ cask :v1 => 'java' do
                        "/Library/Java/JavaVirtualMachines/jdk#{version.split('-')[0]}.jdk/Contents",
                        '/Library/PreferencePanes/JavaControlPanel.prefPane',
                        '/Library/Java/Home',
-                        '/usr/lib/java/libjdns_sd.jnilib',
-                        MacOS.release <= :mavericks ? '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' : '',
-                       ].keep_if { |v| !v.empty? }
+                        if MacOS.release <= :mavericks
+                          [
+                           '/usr/lib/java/libjdns_sd.jnilib',
+                           '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK'
+                          ]
+                        end
+                       ].keep_if { |v| !v.nil? }
  zap       :delete => [
                        '~/Library/Application Support/Oracle/Java',
                        '~/Library/Caches/com.oracle.java.Java-Updater',