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

Fix facter unit test when using realpath

Browse Source
This commit is contained in:
Will Meek
2017-11-15 12:14:26 +00:00
parent e50eb64614
commit e1df6498c7
2 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/facter/java_default_home.rb
View File

@@ -17,12 +17,11 @@ Facter.add(:java_default_home) do
if java_bin.empty?
nil
else
# We might have found a symlink instead of the real binary
java_bin = File.realpath(java_bin)
if java_bin =~ %r(/jre/)
java_default_home = File.dirname(File.dirname(File.dirname(java_bin)))
java_path = File.realpath(java_bin)
if java_path =~ %r(/jre/)
java_default_home = File.dirname(File.dirname(File.dirname(java_path)))
else
java_default_home = File.dirname(File.dirname(java_bin))
java_default_home = File.dirname(File.dirname(java_path))
end
end
end