From 0a50f7984d7b50423779541d2be9a4d67248c6b6 Mon Sep 17 00:00:00 2001
From: Bradley Hess <bdhess@pobox.com>
Date: Thu, 8 Oct 2015 14:09:03 -0400
Subject: [PATCH] Fix for 10.11 issues described in
caskroom/homebrew-cask#13941
---
Casks/java7.rb | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/Casks/java7.rb b/Casks/java7.rb
index 4470144f9..0b0aba8e2 100644
--- a/Casks/java7.rb
+++ b/Casks/java7.rb
@@ -21,17 +21,22 @@ cask :v1 => 'java7' do
'/usr/libexec/PlistBuddy', '-c', 'Add :JavaVM:JVMCapabilities: string WebStart', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist"
system '/usr/bin/sudo', '-E', '--',
'/usr/libexec/PlistBuddy', '-c', 'Add :JavaVM:JVMCapabilities: string Applets', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist"
- system '/usr/bin/sudo', '-E', '--',
- '/bin/rm', '-rf', '--', '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK'
- system '/usr/bin/sudo', '-E', '--',
- '/bin/ln', '-nsf', '--', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents", '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK'
system '/usr/bin/sudo', '-E', '--',
'/bin/mkdir', '-p', '--', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Home/bundle/Libraries"
system '/usr/bin/sudo', '-E', '--',
'/bin/ln', '-nsf', '--', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Home/jre/lib/server/libjvm.dylib", "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Home/bundle/Libraries/libserver.dylib"
+ if MacOS.release <= :mavericks
+ system '/usr/bin/sudo', '-E', '--',
+ '/bin/rm', '-rf', '--', '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK'
+ system '/usr/bin/sudo', '-E', '--',
+ '/bin/ln', '-nsf', '--', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents", '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK'
+ end
end
+
uninstall :pkgutil => 'com.oracle.jdk7u79',
- :delete => '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK'
+ :delete => [
+ MacOS.release <= :mavericks ? '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' : ''
+ ].keep_if { |v| !v.empty? }
zap :delete => [
'~/Library/Application Support/Oracle/Java',