Fixing several facts due to different version scheme and locations in

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

View File

@@ -17,13 +17,11 @@ Facter.add(:java_major_version) do
setcode do
java_version = Facter.value(:java_version)
unless java_version.nil?
# First part > 1, use the first part as major version
java_version_first_number = java_version.strip.split('.')[0]
java_major_version = if java_version_first_number.to_i > 1
java_version_first_number
else
java_version.strip.split('_')[0].split('.')[1]
end
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
end
end
java_major_version