From 0399a842a75943b6d57e8980a4fbbfcbeb59bc69 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Sat, 25 Apr 2020 20:32:30 +0200 Subject: docker-based .deb build scripts: Set version via git describe --- scripts/makedeb-docker | 2 +- scripts/makedeb-docker-helper | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/makedeb-docker b/scripts/makedeb-docker index 60e1047..6c06971 100755 --- a/scripts/makedeb-docker +++ b/scripts/makedeb-docker @@ -5,7 +5,7 @@ mkdir -p out docker run --rm -v "${PWD}:/orig:ro" -v "${PWD}/scripts:/scripts:ro" \ -v "${PWD}/out:/out" -e USER=$(id -u) -e GROUP=$(id -g) \ -e "DEBEMAIL=${DEBEMAIL}" -e "DEBFULLNAME=${DEBFULLNAME}" \ - -e "LOGNAME=${LOGNAME}" \ + -e "LOGNAME=${LOGNAME}" -e "VERSION=$(git describe --dirty)-1" \ debian:buster /scripts/makedeb-docker-helper echo "Debian package has been written to $(pwd)/out" diff --git a/scripts/makedeb-docker-helper b/scripts/makedeb-docker-helper index 23bfc1c..7e0a2ef 100755 --- a/scripts/makedeb-docker-helper +++ b/scripts/makedeb-docker-helper @@ -29,6 +29,6 @@ perl Build perl Build manifest perl Build dist mv Travel-Status-DE-IRIS-*.tar.gz ../app.tar.gz -dh-make-perl --build +dh-make-perl --build --version "${VERSION}" chown ${USER}:${GROUP} ../*.deb mv -v ../*.deb /out -- cgit v1.2.3