bdfc567c18
need to fiddle with it. The default case statement, "do nothing" is all fine here. Facter::Util::Resolution.with_env is long time gone since Facter > 2.x. That was even longer before introduced by me. Remove that OpenBSD special case in the java_version fact, and assume that $PATH is properly set in order to find the 'java' binary. Additionally confine the java_default_home and java_libjvm_path to OpenBSD kernel as well. Add some flesh to the java_default_home fact to allow it to find the java binary.
35 lines
971 B
Ruby
35 lines
971 B
Ruby
# Fact: java_default_home
|
|
#
|
|
# Purpose: get absolute path of java system home
|
|
#
|
|
# Resolution:
|
|
# Uses `readlink` to resolve the path of `/usr/bin/java` then returns subsubdir
|
|
#
|
|
# Caveats:
|
|
# Requires readlink
|
|
#
|
|
# Notes:
|
|
# None
|
|
Facter.add(:java_default_home) do
|
|
confine :kernel => [ 'Linux', 'OpenBSD' ]
|
|
setcode do
|
|
if Facter::Util::Resolution.which('readlink')
|
|
java_bin = Facter::Util::Resolution.exec('readlink -e /usr/bin/java').to_s.strip
|
|
if java_bin.empty?
|
|
java_bin = Facter::Util::Resolution.exec('readlink -e /usr/local/bin/java').to_s.strip
|
|
if java_bin.empty?
|
|
java_bin = Facter::Util::Resolution.which('java').to_s.strip
|
|
if java_bin.empty?
|
|
nil
|
|
end
|
|
end
|
|
end
|
|
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
|