diff --git a/lib/facter/java_default_home.rb b/lib/facter/java_default_home.rb index c198c2c..dccbaf2 100644 --- a/lib/facter/java_default_home.rb +++ b/lib/facter/java_default_home.rb @@ -1,32 +1,32 @@ # frozen_string_literal: true # Fact: java_default_home # # Purpose: get absolute path of java system home # # Resolution: # Find the real java binary, and return the subsubdir # # Caveats: # java binary has to be found in $PATH # # Notes: # None Facter.add(:java_default_home) do confine kernel: ['Linux', 'OpenBSD'] java_default_home = nil setcode do java_bin = Facter::Util::Resolution.which('java').to_s.strip if java_bin.empty? nil else java_path = File.realpath(java_bin) - java_default_home = if java_path =~ %r{/jre/} + java_default_home = if %r{/jre/}.match?(java_path) File.dirname(File.dirname(File.dirname(java_path))) else File.dirname(File.dirname(java_path)) end end end java_default_home end