From 3709754f869e1a8be6eba4c71e9d83b8817317cc Mon Sep 17 00:00:00 2001 From: Lavaburn Date: Tue, 11 Nov 2014 11:56:42 +0100 Subject: [PATCH] Added support for uncompressed Tarballs (.tar) --- README.md | 2 ++ manifests/extract.pp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/README.md b/README.md index 60811ff..1bfd362 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,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` @@ -61,3 +62,4 @@ Contributors * Zijad Purkovic (zajk) * Martin Konrad (mark0n) * Brendan Murtagh (bmurt) +* Nicolas Truyens (lavaburn) diff --git a/manifests/extract.pp b/manifests/extract.pp index fec7335..16a4888 100644 --- a/manifests/extract.pp +++ b/manifests/extract.pp @@ -47,12 +47,14 @@ present: { $extract_zip = "unzip -o ${src_target}/${name}.${extension} -d ${extract_dir}" + $extract_tar = "tar --no-same-owner --no-same-permissions --strip-components=${strip_components} -xf ${src_target}/${name}.${extension} -C ${extract_dir}" $extract_targz = "tar --no-same-owner --no-same-permissions --strip-components=${strip_components} -xzf ${src_target}/${name}.${extension} -C ${extract_dir}" $extract_tarxz = "tar --no-same-owner --no-same-permissions --strip-components=${strip_components} -xJf ${src_target}/${name}.${extension} -C ${extract_dir}" $extract_tarbz2 = "tar --no-same-owner --no-same-permissions --strip-components=${strip_components} -xjf ${src_target}/${name}.${extension} -C ${extract_dir}" $unpack_command = $extension ? { 'zip' => "mkdir -p ${extract_dir} && ${extract_zip}", + 'tar' => "mkdir -p ${extract_dir} && ${extract_tar}", /(tar.gz|tgz)/ => "mkdir -p ${extract_dir} && ${extract_targz}", /(tar.xz|txz)/ => "mkdir -p ${extract_dir} && ${extract_tarxz}", /(tar.bz2|tbz|tbz2)/ => "mkdir -p ${extract_dir} && ${extract_tarbz2}",