MODULES-4368: return nil if java_bin is not found (readlink result is empty)
This commit is contained in:
@@ -15,7 +15,9 @@ 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
|
||||
if java_bin =~ %r(/jre/)
|
||||
if java_bin.empty?
|
||||
nil
|
||||
elsif 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))
|
||||
|
||||
Reference in New Issue
Block a user