PMM-13487 Fix passing pmm_release to the client script

percona · Dec 1, 2024 · 6a3f018 · 6a3f018
1 parent 6f7f957
commit 6a3f018
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/build/scripts/build-client-packages b/build/scripts/build-client-packages
@@ -144,7 +144,6 @@ build_source_deb(){
   rm -f *.dsc *.orig.tar.gz *.debian.tar.gz *.changes
 
   local TARFILE=$(get_tar "tarball")
-  # TARFILE=$(basename $(find . -name "${PACKAGE_NAME}-*.tar.gz" | sort | tail -n1))
   local NAME=$(echo ${TARFILE}| awk -F '-' '{print $1"-"$2}')
   local VERSION_TMP=$(echo ${TARFILE}| awk -F '-' '{print $3}')
   local VERSION=${VERSION_TMP%.tar.gz}
@@ -246,8 +245,8 @@ main() {
   REPO="https://github.com/Percona-Lab/pmm-submodules.git"
 
   if [ -n "$pmm_release" ]; then
-    RPM_RELEASE="$RPM_RELEASE.$pmm_release"
-    DEB_RELEASE="$DEB_RELEASE.$pmm_release"
+    RPM_RELEASE="$pmm_release"
+    DEB_RELEASE="$pmm_release"
   fi
 
   check_workdir

diff --git a/build/scripts/vars b/build/scripts/vars
@@ -28,6 +28,10 @@ fi
 pmm_version=$(cat ${root_dir}/VERSION | awk -F'-' '{print $1}')
 pmm_release=$(cat ${root_dir}/VERSION | awk -F'-' '{print $2}')
 
+if [ -z "$pmm_release" ]; then
+  pmm_release=1
+fi
+
 echo -e "\n---\n>>> full_pmm_version=${full_pmm_version} pmm_version=${pmm_version} pmm_release=${pmm_release} <<<\n---\n"
 
 platform=${PLATFORM:-linux/amd64}