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.
45 lines
1.4 KiB
Ruby
45 lines
1.4 KiB
Ruby
# Fact: java_version
|
|
#
|
|
# Purpose: get full java version string
|
|
#
|
|
# Resolution:
|
|
# Tests for presence of java, returns nil if not present
|
|
# returns output of "java -version" and splits on \n + '"'
|
|
#
|
|
# Caveats:
|
|
# none
|
|
#
|
|
# Notes:
|
|
# None
|
|
Facter.add(:java_version) do
|
|
# the OS-specific overrides need to be able to return nil,
|
|
# to indicate "no java available". Usually returning nil
|
|
# would mean that facter falls back to a lower priority
|
|
# resolution, which would then trigger MODULES-2637. To
|
|
# avoid that, we confine the "default" here to not run
|
|
# on those OS.
|
|
# Additionally, facter versions prior to 2.0.1 only support
|
|
# positive matches, so this needs to be done manually in setcode.
|
|
setcode do
|
|
unless [ 'darwin' ].include? Facter.value(:operatingsystem).downcase
|
|
version = nil
|
|
if Facter::Util::Resolution.which('java')
|
|
Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.each { |line| version = $~[1] if /^.+ version \"(.+)\"$/ =~ line }
|
|
end
|
|
version
|
|
end
|
|
end
|
|
end
|
|
|
|
Facter.add(:java_version) do
|
|
confine :operatingsystem => 'Darwin'
|
|
has_weight 100
|
|
setcode do
|
|
unless /Unable to find any JVMs matching version/ =~ Facter::Util::Resolution.exec('/usr/libexec/java_home --failfast 2>&1')
|
|
version = nil
|
|
Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.each { |line| version = $~[1] if /^.+ version \"(.+)\"$/ =~ line }
|
|
version
|
|
end
|
|
end
|
|
end
|