Skip to content

Commit 394eb4c

Browse files
committed
Fix version number in splash screen
1 parent c757a3d commit 394eb4c

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

distribute/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ENV LANG C.UTF-8
1212
# note: don't build with OpenJDK > 16, as this is the runtime we ship
1313
RUN apt-get update && \
1414
apt-get install -y openjdk-11-jdk git wget shellcheck bash make maven python3-minimal python3-pip \
15-
nsis zip libfuse2 checkinstall makepkg fonts-noto-extra potrace sudo && \
15+
nsis zip libfuse2 checkinstall makepkg fonts-noto-extra potrace sudo librsvg2-bin && \
1616
python3 -m pip install git+https://github.com/TheAssassin/appimagecraft.git@6b36fda#egg=appimagecraft
1717

1818
# we don't have a defined $HOME, but we need Maven to write the libLaserCut artifact somewhere

distribute/distribute.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ log() {
2323
# targets to be built need to be passed on the commandline
2424
# if no targets are provided, we display a help text
2525
if [[ "${1:-}" == "" ]]; then
26-
log "Usage: [env NO_BUILD=1] $0 <targets>"
26+
log "Usage: [env NO_BUILD=1 VERSION=1.2.3-mystuff] $0 <targets>"
2727
echo
2828
log "Available targets:"
2929
log " - zip"
@@ -34,6 +34,7 @@ if [[ "${1:-}" == "" ]]; then
3434
echo
3535
log "Available environment variables:"
3636
log " - \$NO_BUILD=[...]: if set to any string, $0 won't build a JAR (saves build time if the script ran already)"
37+
log " - \$VERSION=[...]: if set to any string, will overwrite the version number"
3738
exit 2
3839
fi
3940

@@ -61,7 +62,7 @@ else
6162
# 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
6263
# we need to ignore this tag to get a proper version number
6364
# 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
64-
if ! VERSION="$(git describe --tags --exclude 'continuous')+devel"; then
65+
if ! VERSION="$(git describe --tags --exclude 'continuous')"; then
6566
echo "Error: could not fetch proper version number with git, try git fetch -a"
6667
exit 2
6768
fi

0 commit comments

Comments
 (0)