diff --git a/lib/facter/freeradius_maj_version.rb b/lib/facter/freeradius_maj_version.rb deleted file mode 100644 index 758a4eca55552117ca9b64ea44d417550a3763dd..0000000000000000000000000000000000000000 --- a/lib/facter/freeradius_maj_version.rb +++ /dev/null @@ -1,13 +0,0 @@ -# Grab the FreeRADIUS version from the output of radiusd -v -Facter.add(:freeradius_maj_version) do - setcode do - version = Facter::Core::Execution.exec('radiusd -v') - if version.nil? - version = Facter::Core::Execution.exec('freeradius -v') - end - if !version.nil? - version = version.split(/\n/)[0].match(/FreeRADIUS Version (\d)\.\d\.\d/)[1].to_s - end - version - end -end diff --git a/lib/facter/freeradius_version.rb b/lib/facter/freeradius_version.rb index 2473a85fab9970d7d9a329aa48d2e3363e58cb06..ac393ce46eeeb379db088aec6bb33107c36fea73 100644 --- a/lib/facter/freeradius_version.rb +++ b/lib/facter/freeradius_version.rb @@ -1,14 +1,23 @@ # Grab the FreeRADIUS version from the output of radiusd -v +version = Facter::Core::Execution.exec('radiusd -v') +if version.nil? + version = Facter::Core::Execution.exec('freeradius -v') +end + Facter.add(:freeradius_version) do setcode do - version = Facter::Core::Execution.exec('radiusd -v') - if version.nil? - version = Facter::Core::Execution.exec('freeradius -v') - end if !version.nil? - version = version.split(/\n/)[0].match(/FreeRADIUS Version (\d\.\d\.\d)/)[1].to_s + minver = version.split(/\n/)[0].match(/FreeRADIUS Version (\d\.\d\.\d)/)[1].to_s end - version + minver end end +Facter.add(:freeradius_maj_version) do + setcode do + if !version.nil? + majver = version.split(/\n/)[0].match(/FreeRADIUS Version (\d)\.\d\.\d/)[1].to_s + end + majver + end +end