dnrops
/
homebrew-cask
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

java, zulu: remove <= mavericks conditionals (#41623)

This commit is contained in:
commitay 2017-12-06 07:35:19 +10:00 committed by Vítor Galvão
parent bb4501548e
commit 4fa6a75de3
2 changed files with 3 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Casks/java.rb
View File

@ -33,15 +33,6 @@ cask 'java' do
system_command '/bin/ln',
args: ['-nsf', '--', "/Library/Java/JavaVirtualMachines/jdk-#{version.before_comma}.jdk/Contents/Home/lib/server/libjvm.dylib", "/Library/Java/JavaVirtualMachines/jdk-#{version.before_comma}.jdk/Contents/Home/bundle/Libraries/libserver.dylib"],
sudo: true
if MacOS.version <= :mavericks
system_command '/bin/rm',
args: ['-rf', '--', '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK'],
sudo: true
system_command '/bin/ln',
args: ['-nsf', '--', "/Library/Java/JavaVirtualMachines/jdk-#{version.before_comma}.jdk/Contents", '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK'],
sudo: true
end
end
uninstall pkgutil: [
@ -61,13 +52,7 @@ cask 'java' do
"/Library/Java/JavaVirtualMachines/jdk-#{version.before_comma}.jdk/Contents",
'/Library/PreferencePanes/JavaControlPanel.prefPane',
'/Library/Java/Home',
if MacOS.version <= :mavericks
[
'/usr/lib/java/libjdns_sd.jnilib',
'/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK',
]
end,
].keep_if { |v| !v.nil? }
]
zap trash: [
'/Library/Application Support/Oracle/Java',

20
Casks/zulu.rb
View File

@ -24,28 +24,12 @@ cask 'zulu' do
system_command '/usr/libexec/PlistBuddy',
args: ['-c', 'Add :JavaVM:JVMCapabilities: string JNI', "/Library/Java/JavaVirtualMachines/zulu-#{version.major}.jdk/Contents/Info.plist"],
sudo: true
if MacOS.version <= :mavericks
system_command '/bin/rm',
args: ['-rf', '--', '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK'],
sudo: true
system_command '/bin/ln',
args: ['-nsf', '--', "/Library/Java/JavaVirtualMachines/zulu-#{version.major}.jdk/Contents", '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK'],
sudo: true
end
end
uninstall pkgutil: [
"com.azulsystems.zulu.#{version.major}",
],
uninstall pkgutil: "com.azulsystems.zulu.#{version.major}",
delete: [
"/Library/Java/JavaVirtualMachines/zulu-#{version}.jdk",
"/Library/Java/JavaVirtualMachines/zulu-#{version.major}.jdk",
'/Library/Java/Home',
if MacOS.version <= :mavericks
[
'/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK',
]
end,
].keep_if { |v| !v.nil? }
]
end