From 06f27357b4629bab27d334e8f00c9ece4ffe6c73 Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Mon, 27 Jun 2022 11:25:14 +0900 Subject: [PATCH] build_reloc.sh: rename relocatable packages Currently, we use following naming convention for relocatable package filename: ${package_name}-${arch}-package-${version}.${release}.tar.gz But this is very different with Linux standard packaging system such as .rpm and .deb. Let's align the convention to .rpm style, so new convention should be: ${package_name}-${version}-${release}.${arch}.tar.gz See scylladb/scylla#9799 Closes #185 --- reloc/build_reloc.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/reloc/build_reloc.sh b/reloc/build_reloc.sh index d5af00b..d14c1bf 100755 --- a/reloc/build_reloc.sh +++ b/reloc/build_reloc.sh @@ -37,6 +37,7 @@ VERSION=$(./SCYLLA-VERSION-GEN ${VERSION_OVERRIDE:+ --version "$VERSION_OVERRIDE # the former command should generate build/SCYLLA-PRODUCT-FILE and some other version # related files PRODUCT=`cat build/SCYLLA-PRODUCT-FILE` +DEST="build/$PRODUCT-jmx-$VERSION.noarch.tar.gz" is_redhat_variant() { [ -f /etc/redhat-release ] @@ -55,8 +56,8 @@ if [ "$CLEAN" = "yes" ]; then rm -rf build target fi -if [ -f build/$PRODUCT-jmx-package.tar.gz ]; then - rm build/$PRODUCT-jmx-package.tar.gz +if [ -f "$DEST" ]; then + rm "$DEST" fi if [ -z "$NODEPS" ]; then @@ -66,4 +67,4 @@ fi mvn -B --file scylla-jmx-parent/pom.xml install ./SCYLLA-VERSION-GEN ${VERSION_OVERRIDE:+ --version "$VERSION_OVERRIDE"} ./dist/debian/debian_files_gen.py -scripts/create-relocatable-package.py build/$PRODUCT-jmx-package.tar.gz +scripts/create-relocatable-package.py "$DEST"