From 7b2b5f7988d8d6f4d372e4cfdb9890da0309aa19 Mon Sep 17 00:00:00 2001 From: Emory Barlow Date: Thu, 29 Nov 2018 15:11:51 -0500 Subject: [PATCH] Fix package naming scheme for debs --- scripts/generate_deb.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/generate_deb.sh b/scripts/generate_deb.sh index 9b7cb9a54f0..5009f7627b3 100644 --- a/scripts/generate_deb.sh +++ b/scripts/generate_deb.sh @@ -1,10 +1,17 @@ #! /bin/bash -NAME="${PROJECT}_${VERSION}-1_amd64" PREFIX="usr" SPREFIX=${PREFIX} SUBPREFIX="opt/${PROJECT}/${VERSION}" SSUBPREFIX="opt\/${PROJECT}\/${VERSION}" +RELEASE="${VERSION_SUFFIX}" + +# default release to "1" if there is no suffix +if [[ -z $RELEASE ]]; then + RELEASE="1" +fi + +NAME="${PROJECT}_${VERSION_NO_SUFFIX}-${RELEASE}_amd64" DEPS_STR="" for dep in "${DEPS[@]}"; do @@ -12,7 +19,7 @@ for dep in "${DEPS[@]}"; do done mkdir -p ${PROJECT}/DEBIAN echo "Package: ${PROJECT} -Version: ${VERSION} +Version: ${VERSION_NO_SUFFIX}-${RELEASE} Section: devel Priority: optional Depends: libbz2-dev (>= 1.0), libssl-dev (>= 1.0), libgmp3-dev, build-essential, libicu-dev, zlib1g-dev