bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

unified: derive UNIFIED_PKG from --build-dir

Browse Source 
we should respect the --build-dir if --unified-pkg is not specified,
and deduce the path to unified pkg from BUILD_DIR.

so, in this change, we deduce the path to unified pkg from BUILD_DIR
unless --unified-pkg is specfied.

Signed-off-by: Kefu Chai <kefu.chai@scylladb.com>
This commit is contained in:
Kefu Chai
2023-09-12 20:37:55 +08:00
parent 4bb5af763b
commit fea3a11716
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
unified/build_unified.sh
View File

@@ -28,7 +28,7 @@ RELEASE_ESC=${RELEASE//./\.}
PKGS=
BUILD_DIR="build/release"
UNIFIED_PKG="build/release/$PRODUCT-unified-$VERSION-$RELEASE.$(arch).tar.gz"
UNIFIED_PKG=""
while [ $# -gt 0 ]; do
case "$1" in
"--build-dir")
@@ -49,6 +49,9 @@ while [ $# -gt 0 ]; do
esac
done
if [ -z "$UNIFIED_PKG" ]; then
UNIFIED_PKG="$BUILD_DIR/$PRODUCT-unified-$VERSION-$RELEASE.$(arch).tar.gz"
fi
UNIFIED_PKG="$(realpath -s $UNIFIED_PKG)"
PKGS="$BUILD_DIR/dist/tar/$PRODUCT-$VERSION-$RELEASE.$(arch).tar.gz $BUILD_DIR/dist/tar/$PRODUCT-python3-$VERSION-$RELEASE.$(arch).tar.gz $BUILD_DIR/dist/tar/$PRODUCT-jmx-$VERSION-$RELEASE.noarch.tar.gz $BUILD_DIR/dist/tar/$PRODUCT-tools-$VERSION-$RELEASE.noarch.tar.gz $BUILD_DIR/dist/tar/$PRODUCT-cqlsh-$VERSION-$RELEASE.noarch.tar.gz"
BASEDIR="$BUILD_DIR/unified/$PRODUCT-$VERSION"