From: Zack Cerza <zack@redhat.com>
Date: Wed, 30 Oct 2024 17:21:57 +0000 (-0600)
Subject: ceph-dev-new-setup: Support tar.xz
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2285%2Fhead;p=ceph-build.git

ceph-dev-new-setup: Support tar.xz

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/ceph-dev-new-setup/build/build b/ceph-dev-new-setup/build/build
index b5a9bc66..da22a22a 100644
--- a/ceph-dev-new-setup/build/build
+++ b/ceph-dev-new-setup/build/build
@@ -108,16 +108,21 @@ if [ -d "$releasedir/$cephver" ]; then
 else
     dch -v $cephver-1 'autobuilder'
 
+    # declare an associative array to map file extensions to tar flags
+    declare -A compression=( ["bz2"]="j" ["gz"]="z" ["xz"]="J" )
+    for cmp in "${!compression[@]}"; do
+        rm -f ceph-*.tar.$cmp
+    done
     echo building tarball
-    rm ceph-*.tar.gz || true
-    rm ceph-*.tar.bz2 || true
-
     ./make-dist $cephver
-    vers=`ls ceph-*.tar.bz2 | cut -c 6- | sed 's/.tar.bz2//'`
-    extension="tar.bz2"
-    extract_flags="jxf"
-    compress_flags="jcf"
-
+    for cmp in "${!compression[@]}"; do
+      extension="tar.$cmp"
+      vers=$(ls ceph-*.$extension | cut -c 6- | sed "s/.$extension//" || true)
+      flag="${compression[$cmp]}"
+      extract_flags="${flag}xf"
+      compress_flags="${flag}cf"
+      if [ "$vers" != "" ]; then break; fi
+    done
     echo tarball vers $vers
 
     echo extracting