Fixing several facts due to different version scheme and locations in
specific java versions
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
# Purpose: get Java's patch level
|
||||
#
|
||||
# Resolution:
|
||||
# Uses java_version fact splits on the patch number (after _)
|
||||
# Uses java_version fact splits on the patch number (after _ for 1.x and patch number for semver'ed javas)
|
||||
#
|
||||
# Caveats:
|
||||
# none
|
||||
@@ -15,13 +15,11 @@ Facter.add(:java_patch_level) do
|
||||
setcode do
|
||||
java_version = Facter.value(:java_version)
|
||||
unless java_version.nil?
|
||||
# First part > 1, use . as seperator to get patch level
|
||||
java_version_first_number = java_version.strip.split('.')[0]
|
||||
java_patch_level = if java_version_first_number.to_i > 1
|
||||
java_version.strip.split('.')[2]
|
||||
else
|
||||
java_version.strip.split('_')[1]
|
||||
end
|
||||
if java_version.strip[0..1] == '1.'
|
||||
java_patch_level = java_version.strip.split('_')[1] unless java_version.nil?
|
||||
else
|
||||
java_patch_level = java_version.strip.split('.')[2] unless java_version.nil?
|
||||
end
|
||||
end
|
||||
end
|
||||
java_patch_level
|
||||
|
||||
Reference in New Issue
Block a user