X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Flib%2Ffacter%2Froot_home.rb;fp=3rdparty%2Fmodules%2Fstdlib%2Flib%2Ffacter%2Froot_home.rb;h=d4add7b4d2e4fef19860c6cfe66b28bbfa39aa19;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=87c76571885be2d23b5b43620032c0e6e703d8f2;hpb=407d322498f4fde815abf381007fbecfe5c10b2b;p=mirror%2Fdsa-puppet.git diff --git a/3rdparty/modules/stdlib/lib/facter/root_home.rb b/3rdparty/modules/stdlib/lib/facter/root_home.rb index 87c765718..d4add7b4d 100644 --- a/3rdparty/modules/stdlib/lib/facter/root_home.rb +++ b/3rdparty/modules/stdlib/lib/facter/root_home.rb @@ -1,30 +1,29 @@ # A facter fact to determine the root home directory. # This varies on PE supported platforms and may be # reconfigured by the end user. - module Facter::Util::RootHome class << self - def get_root_home - root_ent = Facter::Util::Resolution.exec("getent passwd root") + def returnt_root_home + root_ent = Facter::Util::Resolution.exec('getent passwd root') # The home directory is the sixth element in the passwd entry # If the platform doesn't have getent, root_ent will be nil and we should # return it straight away. - root_ent && root_ent.split(":")[5] + root_ent && root_ent.split(':')[5] end end end Facter.add(:root_home) do - setcode { Facter::Util::RootHome.get_root_home } + setcode { Facter::Util::RootHome.returnt_root_home } end Facter.add(:root_home) do confine :kernel => :darwin setcode do - str = Facter::Util::Resolution.exec("dscacheutil -q user -a name root") + str = Facter::Util::Resolution.exec('dscacheutil -q user -a name root') hash = {} str.split("\n").each do |pair| - key,value = pair.split(/:/) + key, value = pair.split(%r{:}) hash[key] = value end hash['dir'].strip @@ -35,10 +34,10 @@ Facter.add(:root_home) do confine :kernel => :aix root_home = nil setcode do - str = Facter::Util::Resolution.exec("lsuser -c -a home root") + str = Facter::Util::Resolution.exec('lsuser -c -a home root') str && str.split("\n").each do |line| - next if line =~ /^#/ - root_home = line.split(/:/)[1] + next if line =~ %r{^#} + root_home = line.split(%r{:})[1] end root_home end