Fix version mismatch between Makefile and meson

Author: bynect

Makefile

@@ -3,10 +3,7 @@
 
 include config.mk
 
-VERSION := "1.13.0-non-git"
-ifneq ($(wildcard ./.git/),)
-VERSION := "$(shell ${GIT} describe --tags 2>/dev/null || echo ${VERSION})"
-endif
+VERSION := "$(shell ./get-version.sh)"
 
 SYSTEMD ?= $(shell $(PKG_CONFIG) --silence-errors ${SYSTEMDAEMON} || echo 0)
 

docs/internal/release-checklist.md

@@ -2,7 +2,7 @@
  - [ ] Update the changelog
  - [ ] Write release notes (Only if non-patch release)
  - [ ] Verify that the working directory is clean and on the master branch
- - [ ] Change the version in the Makefile to "x.x.x (iso-date)" (ex. "1.9.0 (2022-06-27)")
+ - [ ] Change the version in the get-version.sh to "x.x.x (iso-date)" (ex. "1.9.0 (2022-06-27)")
  - [ ] Commit changes (Commit title: `Dunst vX.X.X`)
  - [ ] Tag commit, make sure it's an annotated tag (`git tag -a "vX.X.X" -m "Dunst vX.X.X"`)
  - [ ] Push commits and tags
@@ -17,5 +17,5 @@
  - [ ] Copy release notes to githubs release feature
  - [ ] Publish release on github
 
- - [ ] Update Makefile version to "x.x.x-non-git"
+ - [ ] Update the get-version.sh fallback to "x.x.x-non-git"
  - [ ] Commit & push

get-version.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Fallback version here
+version="1.13.0-non-git"
+
+version="$(git describe --tags 2>/dev/null || echo "$version")"
+
+# No leading newline
+printf "%s" "$version"

meson.build

@@ -1,7 +1,7 @@
 project(
     'dunst',
     'c',
-    version: '1.9.2',
+    version: run_command('./get-version.sh', check: true).stdout(),
     license: 'MIT',
     meson_version: '>=0.60.0',
     default_options: [