diff options
| author | Dave Newman <dnewman@schoology.com> | 2016-02-04 11:48:38 -0500 |
|---|---|---|
| committer | Dave Newman <dnewman@schoology.com> | 2016-02-04 11:48:38 -0500 |
| commit | dae608a137f45b9fa6ea3ca6655f4c131e6e3c9f (patch) | |
| tree | 6e854b3d3d3d8a93588b6c220c3f2dea940df76d | |
| parent | 15c37362e04176c7b750be2e3d2c5c21532f6fbf (diff) | |
| download | ohai-dae608a137f45b9fa6ea3ca6655f4c131e6e3c9f.tar.gz | |
OHAI-726 Fixed regex so unit tests pass.
| -rw-r--r-- | lib/ohai/plugins/java.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ohai/plugins/java.rb b/lib/ohai/plugins/java.rb index 6856d3e7..1130e8b9 100644 --- a/lib/ohai/plugins/java.rb +++ b/lib/ohai/plugins/java.rb @@ -26,7 +26,7 @@ Ohai.plugin(:Java) do if so.exitstatus == 0 so.stderr.split(/\r?\n/).each do |line| case line - when /java|openjdk version \"([0-9\.\_]+)\"/ + when /(?:java|openjdk) version \"([0-9\.\_]+)\"/ java[:version] = $1 when /^(.+Runtime Environment.*) \((build)\s*(.+)\)$/ java[:runtime] = { "name" => $1, "build" => $3 } |