* Add explicit variable for the uncompress ressource.

This commit is contained in:
gardouille 2015-04-23 16:48:48 +02:00
parent a381759e86
commit c1d266c015
3 changed files with 6 additions and 5 deletions

View File

@ -42,11 +42,11 @@ class ifort (
$ifort_pkg_url = $ifort::params::ifort_pkg_url,
$ifort_pkg_path = $ifort::params::ifort_pkg_path,
$ifort_install_tmp_path = $ifort::params::ifort_install_tmp_path,
$ifort_install_script_path = $ifort::params::ifort_install_script_path,
$ifort_install_dir_name = $ifort::params::ifort_install_dir_name,
$ifort_install_script_name = $ifort::params::ifort_install_script_name,
) inherits ifort::params {
validate_absolute_path($ifort::ifort_pkg_path)
validate_absolute_path($ifort::ifort_install_script_path)
include ifort::install

View File

@ -19,15 +19,15 @@ class ifort::install {
}
if $::is_ifort == 'false' {
# Uncompress
exec { "Uncompress ${ifort::ifort_pkg_path}":
command => "zcat ${ifort::ifort_pkg_path} | tar xvf - -C ${ifort::ifort_install_tmp_path} --",
creates => $ifort::ifort_install_script_path,
creates => "${ifort::ifort_install_tmp_path}/${ifort::ifort_install_dir_name}",
onlyif => "test -f ${ifort::ifort_pkg_path}",
}
}
} # Private class: ifort::install

View File

@ -16,7 +16,8 @@ class ifort::params {
$ifort_pkg_url = ''
$ifort_pkg_path = ''
$ifort_install_tmp_path = '/opt'
$ifort_install_script_path = '/opt/l_fcompxe_2015.2.164/install.sh'
$ifort_install_dir_name = 'l_fcompxe_2015.2.164' # Directory name in the archive
$ifort_install_script_name = 'install.sh'
}
}