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

use variable instead of hardcoded value, refs #298

Browse Source
This commit is contained in:
Frank Wall
2019-02-12 13:29:18 +01:00
parent e247902da5
commit c4100556f0
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/oracle.pp
View File

@@ -300,11 +300,7 @@ define java::oracle (
$install_command = "rpm --force -iv ${destination}" $install_command = "rpm --force -iv ${destination}"
} }
'tar.gz' : { 'tar.gz' : {
if $basedir { $install_command = "tar -zxf ${destination} -C ${_basedir}"
$install_command = "tar -zxf ${destination} -C ${basedir}"
} else {
$install_command = "tar -zxf ${destination} -C /usr/lib/jvm"
}
} }
default : { default : {
$install_command = "rpm -iv ${destination}" $install_command = "rpm -iv ${destination}"
@@ -327,10 +323,10 @@ define java::oracle (
'Linux' : { 'Linux' : {
case $facts['os']['family'] { case $facts['os']['family'] {
'Debian' : { 'Debian' : {
ensure_resource('file', '/usr/lib/jvm', { ensure_resource('file', $_basedir, {
ensure => directory, ensure => directory,
}) })
$install_requires = [Archive[$destination], File['/usr/lib/jvm']] $install_requires = [Archive[$destination], File[$_basedir]]
} }
default : { default : {
$install_requires = [Archive[$destination]] $install_requires = [Archive[$destination]]
@@ -338,7 +334,7 @@ define java::oracle (
} }
if $manage_basedir { if $manage_basedir {
ensure_resource('file', $basedir, {'ensure' => 'directory', 'before' => Exec["Install Oracle java_se ${java_se} ${version} ${release_major} ${release_minor}"]}) ensure_resource('file', $_basedir, {'ensure' => 'directory', 'before' => Exec["Install Oracle java_se ${java_se} ${version} ${release_major} ${release_minor}"]})
} }
exec { "Install Oracle java_se ${java_se} ${version} ${release_major} ${release_minor}" : exec { "Install Oracle java_se ${java_se} ${version} ${release_major} ${release_minor}" :