From 7578d359af1263fc556bdea0f86ee1f0f0324e57 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@scylladb.com>
Date: Fri, 17 Jul 2020 11:57:23 +0300
Subject: [PATCH] reloc: Add "--builddir" option to build_{rpm,deb}.sh

We need the ability to control build directory in scylla.git build
system. Let's add support for the "--builddir" option like in other
variants of the same scripts.

Message-Id: <20200717085723.701209-1-penberg@scylladb.com>
---
 reloc/build_deb.sh | 14 ++++++++++----
 reloc/build_rpm.sh | 12 +++++++++---
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/reloc/build_deb.sh b/reloc/build_deb.sh
index ff93252..a9408c3 100755
--- a/reloc/build_deb.sh
+++ b/reloc/build_deb.sh
@@ -4,10 +4,12 @@
 print_usage() {
     echo "build_deb.sh --reloc-pkg build/scylla-jmx-package.tar.gz"
     echo "  --reloc-pkg specify relocatable package path"
+    echo "  --builddir specify Debian package build path"
     exit 1
 }
 
 RELOC_PKG=$(readlink -f build/scylla-jmx-package.tar.gz)
+BUILDDIR=build/debian
 OPTS=""
 while [ $# -gt 0 ]; do
     case "$1" in
@@ -16,6 +18,10 @@ while [ $# -gt 0 ]; do
             RELOC_PKG=$2
             shift 2
             ;;
+        "--builddir")
+            BUILDDIR="$2"
+            shift 2
+            ;;
         *)
             print_usage
             ;;
@@ -25,8 +31,8 @@ done
 if [[ ! $OPTS =~ --reloc-pkg ]]; then
     OPTS="$OPTS --reloc-pkg $RELOC_PKG"
 fi
-rm -rf build/debian
-mkdir -p build/debian/scylla-package
-tar -C build/debian/scylla-package -xpf $RELOC_PKG
-cd build/debian/scylla-package
+rm -rf "$BUILDDIR"
+mkdir -p "$BUILDDIR"/scylla-package
+tar -C "$BUILDDIR"/scylla-package -xpf $RELOC_PKG
+cd "$BUILDDIR"/scylla-package
 exec ./scylla-jmx/dist/debian/build_deb.sh $OPTS
diff --git a/reloc/build_rpm.sh b/reloc/build_rpm.sh
index 167bf5a..36772a5 100755
--- a/reloc/build_rpm.sh
+++ b/reloc/build_rpm.sh
@@ -4,9 +4,11 @@
 print_usage() {
     echo "build_rpm.sh --reloc-pkg build/scylla-jmx-package.tar.gz"
     echo "  --reloc-pkg specify relocatable package path"
+    echo "  --builddir specify rpmbuild directory"
     exit 1
 }
 RELOC_PKG=$(readlink -f build/scylla-jmx-package.tar.gz)
+BUILDDIR=build/redhat
 OPTS=""
 while [ $# -gt 0 ]; do
     case "$1" in
@@ -15,6 +17,10 @@ while [ $# -gt 0 ]; do
             RELOC_PKG=$2
             shift 2
             ;;
+        "--builddir")
+            BUILDDIR="$2"
+            shift 2
+            ;;
         *)
             print_usage
             ;;
@@ -24,7 +30,7 @@ done
 if [[ ! $OPTS =~ --reloc-pkg ]]; then
     OPTS="$OPTS --reloc-pkg $RELOC_PKG"
 fi
-mkdir -p build/redhat
-tar -C build/redhat/ -xpf $RELOC_PKG scylla-jmx/SCYLLA-RELEASE-FILE scylla-jmx/SCYLLA-RELOCATABLE-FILE scylla-jmx/SCYLLA-VERSION-FILE scylla-jmx/SCYLLA-PRODUCT-FILE scylla-jmx/dist/redhat
-cd build/redhat/scylla-jmx
+mkdir -p "$BUILDDIR"
+tar -C "$BUILDDIR" -xpf $RELOC_PKG scylla-jmx/SCYLLA-RELEASE-FILE scylla-jmx/SCYLLA-RELOCATABLE-FILE scylla-jmx/SCYLLA-VERSION-FILE scylla-jmx/SCYLLA-PRODUCT-FILE scylla-jmx/dist/redhat
+cd "$BUILDDIR"/scylla-jmx
 exec ./dist/redhat/build_rpm.sh $OPTS