diff --git a/README.md b/README.md index 8e2b785..4490b86 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ Puppet Module to download and extract tar and zip archives based on [camptocamp/ Supported archive types are: +- `tar` - `tar.gz`, `tgz` - `tar.bz2`, `tbz2` - `tar.xz`, `txz` diff --git a/manifests/download.pp b/manifests/download.pp old mode 100755 new mode 100644 diff --git a/manifests/extract.pp b/manifests/extract.pp index 0688014..d1e0c0a 100644 --- a/manifests/extract.pp +++ b/manifests/extract.pp @@ -57,9 +57,10 @@ 'present': { $extract_zip = "unzip -o ${src_target}/${name}.${extension} -d ${target}" + $extract_tar = "${tar_command} --no-same-owner --no-same-permissions --strip-components=${strip_components} -xf ${src_target}/${name}.${extension} -C ${target}" $extract_targz = "${tar_command} --no-same-owner --no-same-permissions --strip-components=${strip_components} -xzf ${src_target}/${name}.${extension} -C ${target}" $extract_tarbz2 = "${tar_command} --no-same-owner --no-same-permissions --strip-components=${strip_components} -xjf ${src_target}/${name}.${extension} -C ${target}" - $extract_tarxz = "${tar_command} --no-same-owner --no-same-permissions --strip-components=${strip_components} -xpf ${src_target}/${name}.${extension} -C ${target}" + $extract_tarxz = "${tar_command} --no-same-owner --no-same-permissions --strip-components=${strip_components} -xJf ${src_target}/${name}.${extension} -C ${target}" $purge_command = $purge ? { true => "rm -rf ${target} && ", @@ -68,6 +69,7 @@ $command = $extension ? { 'zip' => "${purge_command}mkdir -p ${target} && ${extract_zip}", + 'tar' => "${purge_command}mkdir -p ${target} && ${extract_tar}", 'tar.gz' => "${purge_command}mkdir -p ${target} && ${extract_targz}", 'tgz' => "${purge_command}mkdir -p ${target} && ${extract_targz}", 'tar.bz2' => "${purge_command}mkdir -p ${target} && ${extract_tarbz2}", diff --git a/manifests/init.pp b/manifests/init.pp old mode 100755 new mode 100644