Skip to content

Commit

Permalink
Fix version number in splash screen
Browse files Browse the repository at this point in the history
  • Loading branch information
mgmax committed Nov 9, 2024
1 parent c757a3d commit 394eb4c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion distribute/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions distribute/distribute.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <targets>"
log "Usage: [env NO_BUILD=1 VERSION=1.2.3-mystuff] $0 <targets>"
echo
log "Available targets:"
log " - zip"
Expand All @@ -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

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 394eb4c

Please sign in to comment.