# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1313335715 -7200
# Node ID 09b546182d5906de73fc6041d2bd12da54c40b0c
# Parent  d35d7cdc049465d6e37ec1b2ff5bcd2b3601668a
scripts/functions: commonalise tar options in CT_EXtract

This shortens command lines, so it's good! :-)

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

diff -r d35d7cdc0494 -r 09b546182d59 scripts/functions
--- a/scripts/functions	Sun Aug 14 16:07:03 2011 +0200
+++ b/scripts/functions	Sun Aug 14 17:28:35 2011 +0200
@@ -703,6 +703,7 @@
     local nochdir="$1"
     local basename
     local ext
+    local -a tar_opts
 
     if [ "${nochdir}" = "nochdir" ]; then
         shift
@@ -740,10 +741,13 @@
 
     CT_DoLog EXTRA "Extracting '${basename}'"
     CT_DoExecLog FILE mkdir -p "${basename}"
+    tar_opts=( "--strip-components=1" )
+    tar_opts+=( "-C" "${basename}" )
+    tar_opts+=( "-xv" )
     case "${ext}" in
-        .tar.bz2)     CT_DoExecLog FILE tar --strip-components=1 -C "${basename}" -xvjf "${full_file}";;
-        .tar.gz|.tgz) CT_DoExecLog FILE tar --strip-components=1 -C "${basename}" -xvzf "${full_file}";;
-        .tar)         CT_DoExecLog FILE tar --strip-components=1 -C "${basename}" -xvf "${full_file}";;
+        .tar.bz2)     CT_DoExecLog FILE tar "${tar_opts[@]}" -j "${full_file}";;
+        .tar.gz|.tgz) CT_DoExecLog FILE tar "${tar_opts[@]}" -z "${full_file}";;
+        .tar)         CT_DoExecLog FILE tar "${tar_opts[@]}" "${full_file}";;
         /.git)        CT_ExtractGit "${basename}" "${@}";;
         *)            CT_DoLog WARN "Don't know how to handle '${basename}${ext}': unknown extension"
                       return 1