diff options
| -rw-r--r-- | lib/ohai/plugins/java.rb | 2 | ||||
| -rw-r--r-- | lib/ohai/plugins/linux/kernel.rb | 2 | ||||
| -rw-r--r-- | lib/ohai/plugins/perl.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/ohai/plugins/java.rb b/lib/ohai/plugins/java.rb index fcc27bfa..6a620a80 100644 --- a/lib/ohai/plugins/java.rb +++ b/lib/ohai/plugins/java.rb @@ -34,7 +34,7 @@ Ohai.plugin do end if so.exitstatus == 0 - so.stderr.lines do |line| + so.stderr.split(/\r?\n/).each do |line| case line when /java version \"([0-9\.\_]+)\"/ java[:version] = $1 diff --git a/lib/ohai/plugins/linux/kernel.rb b/lib/ohai/plugins/linux/kernel.rb index 47a83569..c2dd3e45 100644 --- a/lib/ohai/plugins/linux/kernel.rb +++ b/lib/ohai/plugins/linux/kernel.rb @@ -21,7 +21,7 @@ Ohai.plugin do collect_data do so = shell_out("uname -o") - kernel[:os] = so.stdout.split($/)[0] + kernel[:os] = so.stdout.split(/\r?\n/)[0] kext = Mash.new so = shell_out("env lsmod") diff --git a/lib/ohai/plugins/perl.rb b/lib/ohai/plugins/perl.rb index 64ccac4a..3b4b3282 100644 --- a/lib/ohai/plugins/perl.rb +++ b/lib/ohai/plugins/perl.rb @@ -27,7 +27,7 @@ Ohai.plugin do perl = Mash.new so = shell_out("perl -V:version -V:archname") if so.exitstatus == 0 - so.stdout.lines do |line| + so.stdout.split(/\r?\n/).each do |line| case line when /^version=\'(.+)\';$/ perl[:version] = $1 |