diff options
| author | Julian C. Dunn <jdunn@aquezada.com> | 2014-09-30 11:49:29 -0700 |
|---|---|---|
| committer | Julian C. Dunn <jdunn@aquezada.com> | 2014-09-30 11:49:29 -0700 |
| commit | 70d7535cffbee2ba360dfd2bf97d031a988bca48 (patch) | |
| tree | 436d2796d3c77e89732768cd3d7fc6e9927495c2 | |
| parent | 35dc3d5010dc6392f8fbb7f389534e47c0e0427a (diff) | |
| parent | 2ae3b338483f55bee0a99fffd3112db5c694dbef (diff) | |
| download | ohai-70d7535cffbee2ba360dfd2bf97d031a988bca48.tar.gz | |
Merge pull request #417 from ClogenyTechnologies/kd/aixjavaplugin
Fix java version parsing regex
| -rw-r--r-- | lib/ohai/plugins/java.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ohai/plugins/java.rb b/lib/ohai/plugins/java.rb index 9f71eb7f..3c83d7cc 100644 --- a/lib/ohai/plugins/java.rb +++ b/lib/ohai/plugins/java.rb @@ -28,9 +28,9 @@ Ohai.plugin(:Java) do case line when /java version \"([0-9\.\_]+)\"/ java[:version] = $1 - when /^(.+Runtime Environment.*) \((build )?(.+)\)$/ + when /^(.+Runtime Environment.*) \((build)\s*(.+)\)$/ java[:runtime] = { "name" => $1, "build" => $3 } - when /^(.+ (Client|Server) VM) \(build (.+)\)$/ + when /^(.+ (Client|Server) VM) \(build\s*(.+)\)$/ java[:hotspot] = { "name" => $1, "build" => $3 } end end |