From 394eb4ce74696fec7b0d702d8b5ee12db8cb43b4 Mon Sep 17 00:00:00 2001 From: Max Gaukler Date: Sat, 9 Nov 2024 19:08:21 +0100 Subject: [PATCH] Fix version number in splash screen --- distribute/Dockerfile | 2 +- distribute/distribute.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/distribute/Dockerfile b/distribute/Dockerfile index a7b91691..173d729c 100644 --- a/distribute/Dockerfile +++ b/distribute/Dockerfile @@ -12,7 +12,7 @@ ENV LANG C.UTF-8 # note: don't build with OpenJDK > 16, as this is the runtime we ship RUN apt-get update && \ apt-get install -y openjdk-11-jdk git wget shellcheck bash make maven python3-minimal python3-pip \ - nsis zip libfuse2 checkinstall makepkg fonts-noto-extra potrace sudo && \ + nsis zip libfuse2 checkinstall makepkg fonts-noto-extra potrace sudo librsvg2-bin && \ python3 -m pip install git+https://github.com/TheAssassin/appimagecraft.git@6b36fda#egg=appimagecraft # we don't have a defined $HOME, but we need Maven to write the libLaserCut artifact somewhere diff --git a/distribute/distribute.sh b/distribute/distribute.sh index 64b8d376..707ef15b 100755 --- a/distribute/distribute.sh +++ b/distribute/distribute.sh @@ -23,7 +23,7 @@ log() { # targets to be built need to be passed on the commandline # if no targets are provided, we display a help text if [[ "${1:-}" == "" ]]; then - log "Usage: [env NO_BUILD=1] $0 " + log "Usage: [env NO_BUILD=1 VERSION=1.2.3-mystuff] $0 " echo log "Available targets:" log " - zip" @@ -34,6 +34,7 @@ if [[ "${1:-}" == "" ]]; then echo log "Available environment variables:" log " - \$NO_BUILD=[...]: if set to any string, $0 won't build a JAR (saves build time if the script ran already)" + log " - \$VERSION=[...]: if set to any string, will overwrite the version number" exit 2 fi @@ -61,7 +62,7 @@ else # as the GitHub actions workflow creates a continuous tag on the main branch's HEAD to create prereleases for every push, we must ignore those tags # we need to ignore this tag to get a proper version number # if the command fails, we must abort at this point, as we cannot fall back to some generic name like "unknown" without breaking at least the Debian package build - if ! VERSION="$(git describe --tags --exclude 'continuous')+devel"; then + if ! VERSION="$(git describe --tags --exclude 'continuous')"; then echo "Error: could not fetch proper version number with git, try git fetch -a" exit 2 fi