diff options
| author | Serdar Sutay <serdar@opscode.com> | 2014-10-27 01:18:23 -0700 |
|---|---|---|
| committer | Serdar Sutay <serdar@opscode.com> | 2014-10-27 01:18:23 -0700 |
| commit | 436f72844291980ee3a89313dfc62bd2499700f6 (patch) | |
| tree | d868b2571b64515d998c2806267e092976d7683e /lib/ohai/plugins/java.rb | |
| parent | 2fa5d97b59f4807a0f04366ad8e3a573685848ea (diff) | |
| parent | 3d27b8c72776411eab521cd1ef2e6b6f022acc80 (diff) | |
| download | ohai-sersut/7.6.0-rel-merge.tar.gz | |
Merge branch 'master' into 7-stablesersut/7.6.0-rel-merge
Diffstat (limited to 'lib/ohai/plugins/java.rb')
| -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 |