From: Kefu Chai <kchai@redhat.com>
Date: Mon, 9 Nov 2020 04:31:34 +0000 (+0800)
Subject: make-dist: use a loop to collect the ingredients of the dist tarball
X-Git-Tag: v16.1.0~662^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0d21f98d71a88258a2ea099aafc62d21bae33e73;p=ceph.git

make-dist: use a loop to collect the ingredients of the dist tarball

for better readability

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/make-dist b/make-dist
index 88d735e183b3..043f3271b562 100755
--- a/make-dist
+++ b/make-dist
@@ -157,16 +157,17 @@ download_liburing 0.7 8e2842cfe947f3a443af301bdd6d034455536c38a455c7a700d0c1ad16
                   https://git.kernel.dk/cgit/liburing/snapshot
 build_dashboard_frontend
 generate_rook_ceph_client
-tar --concatenate -f $outfile.all.tar $outfile.version.tar
-tar --concatenate -f $outfile.all.tar $outfile.boost.tar
-tar --concatenate -f $outfile.all.tar $outfile.liburing.tar
-tar --concatenate -f $outfile.all.tar $outfile.tar
-tar --concatenate -f $outfile.all.tar dashboard_frontend.tar
-tar --concatenate -f $outfile.all.tar rook_ceph_client.tar
+for tarball in $outfile.version   \
+               $outfile.boost     \
+               $outfile.liburing  \
+               dashboard_frontend \
+               rook_ceph_client   \
+               $outfile; do
+    tar --concatenate -f $outfile.all.tar $tarball.tar
+    rm $tarball.tar
+done
 mv $outfile.all.tar $outfile.tar
 rm $outfile
-rm -f $outfile.version.tar
-rm -f $outfile.boost.tar
 
 echo "compressing..."
 bzip2 -9 $outfile.tar