(MODULES-4050) Check if jre is in the path before subsubdir

2016-11-07 15:00:47 +01:00
parent 91871b1408
commit b5b03e5c00
2 changed files with 23 additions and 7 deletions
--- a/lib/facter/java_default_home.rb
+++ b/lib/facter/java_default_home.rb
@@ -15,7 +15,11 @@ Facter.add(:java_default_home) do
  setcode do
    if Facter::Util::Resolution.which('readlink')
      java_bin = Facter::Util::Resolution.exec('readlink -e /usr/bin/java').strip
-      java_default_home = File.dirname(File.dirname(File.dirname(java_bin)))
+      if java_bin =~ %r(/jre/)
+        java_default_home = File.dirname(File.dirname(File.dirname(java_bin)))
+      else
+        java_default_home = File.dirname(File.dirname(java_bin))
+      end
    end
  end
 end