Rebase with master, fix conflicts and rubocop issues

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

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