summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2020-04-25 20:32:30 +0200
committerDaniel Friesel <derf@finalrewind.org>2020-04-25 20:32:30 +0200
commit0399a842a75943b6d57e8980a4fbbfcbeb59bc69 (patch)
tree088a1f9461e9f99d63abf4d3d7e80d0d156e667f
parentd68a6ad58e4a2805a9eddbca1cb8063d667b744d (diff)
docker-based .deb build scripts: Set version via git describe
-rwxr-xr-xscripts/makedeb-docker2
-rwxr-xr-xscripts/makedeb-docker-helper2
2 files changed, 2 insertions, 2 deletions
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