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

Rebase with master, fix conflicts and rubocop issues

Browse Source
This commit is contained in:
lionce
2020-01-14 15:38:31 +02:00
parent 61ace5ea01
commit 84546ca9a7
3 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/facter/java_libjvm_path.rb
View File

@@ -17,20 +17,15 @@ Facter.add(:java_libjvm_path) do
java_default_home = Facter.value(:java_default_home)
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
java_libjvm_file = if java_major_version.to_i >= 11
Dir.glob("#{java_default_home}/lib/**/libjvm.so")
else
Dir.glob("#{java_default_home}/jre/lib/**/libjvm.so")
end
if java_libjvm_file.nil? || java_libjvm_file.empty?
nil
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
File.dirname(java_libjvm_file[0])
end
end
end

10
lib/facter/java_major_version.rb
View File

@@ -17,11 +17,11 @@ Facter.add(:java_major_version) do
setcode do
java_version = Facter.value(:java_version)
unless java_version.nil?
if java_version.strip[0..1] == '1.'
java_major_version = java_version.strip.split('_')[0].split('.')[1]
else
java_major_version = java_version.strip.split('.')[0]
end
java_major_version = if java_version.strip[0..1] == '1.'
java_version.strip.split('_')[0].split('.')[1]
else
java_version.strip.split('.')[0]
end
end
end
java_major_version