Merge pull request #315 from olevole/master

MODULES-7819 fix set JAVA_HOME environments on FreeBSD platform
This commit is contained in:
david22swan
2018-11-02 13:46:10 +00:00
committed by GitHub

View File

@@ -44,7 +44,7 @@ class java::config ( ) {
}
}
}
'FreeBSD', 'Suse': {
'Suse': {
if $java::use_java_home != undef {
file_line { 'java-home-environment':
path => '/etc/environment',
@@ -53,6 +53,20 @@ class java::config ( ) {
}
}
}
'FreeBSD': {
if $java::use_java_home != undef {
file_line { 'java-home-environment-profile':
path => '/etc/profile',
line => "JAVA_HOME=${$java::use_java_home}; export JAVA_HOME",
match => 'JAVA_HOME=',
}
file_line { 'java-home-environment-cshrc':
path => '/etc/csh.login',
line => "setenv JAVA_HOME ${$java::use_java_home}",
match => 'setenv JAVA_HOME',
}
}
}
'Solaris': {
if $java::use_java_home != undef {
file_line { 'java-home-environment':