From fea3a11716b6a35e51fbc3e5d03fa59408cba50a Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 12 Sep 2023 20:37:55 +0800 Subject: [PATCH] unified: derive UNIFIED_PKG from --build-dir 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 --- unified/build_unified.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unified/build_unified.sh b/unified/build_unified.sh index 9b2b72aaad..cc854d766d 100755 --- a/unified/build_unified.sh +++ b/unified/build_unified.sh @@ -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"