RickRongen/puppetlabs-java
1
0
Fork 0
Code Releases Activity

MODULES-4368: return nil if java_bin is not found (readlink result is empty)

Browse Source
This commit is contained in:
Jan Vansteenkiste
2017-02-01 08:10:59 +01:00
parent 20960ddb7f
commit c0227ce820
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/facter/java_default_home.rb
View File

@@ -15,7 +15,9 @@ Facter.add(:java_default_home) do
setcode do setcode do
if Facter::Util::Resolution.which('readlink') if Facter::Util::Resolution.which('readlink')
java_bin = Facter::Util::Resolution.exec('readlink -e /usr/bin/java').strip 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))) java_default_home = File.dirname(File.dirname(File.dirname(java_bin)))
else else
java_default_home = File.dirname(File.dirname(java_bin)) java_default_home = File.dirname(File.dirname(java_bin))