RickRongen/puppetlabs-java
1
0
Fork 0
Code Releases Activity

Fixing several facts due to different version scheme and locations in

Browse Source 
specific java versions
This commit is contained in:
Tim Eilers
2019-07-17 15:14:20 +02:00
committed by lionce
parent 4f52cee832
commit 61ace5ea01
3 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/facter/java_libjvm_path.rb
View File

@@ -7,6 +7,7 @@
#
# Caveats:
# Needs to list files recursively. Returns the first match
# Needs working java_major_version fact
#
# Notes:
# None
@@ -14,13 +15,23 @@ Facter.add(:java_libjvm_path) do
confine kernel: ['Linux', 'OpenBSD']
setcode do
java_default_home = Facter.value(:java_default_home)
if java_default_home
java_libjvm_file = Dir.glob("#{java_default_home}/**/lib/**/libjvm.so")
end
if java_libjvm_file.nil? || java_libjvm_file.empty?
nil
else
File.dirname(java_libjvm_file[0])
java_major_version = Facter.value(:java_major_version)
unless java_major_version.nil?
if java_major_version.to_i >= 11
java_libjvm_file = Dir.glob("#{java_default_home}/lib/**/libjvm.so")
if java_libjvm_file.nil? || java_libjvm_file.empty?
nil
else
File.dirname(java_libjvm_file[0])
end
else
java_libjvm_file = Dir.glob("#{java_default_home}/jre/lib/**/libjvm.so")
if java_libjvm_file.nil? || java_libjvm_file.empty?
nil
else
File.dirname(java_libjvm_file[0])
end
end
end
end
end