From 4e140dd334f6d282cda0233981f7b0feff283bd6 Mon Sep 17 00:00:00 2001
From: Joachim Bauch <bauch@struktur.de>
Date: Thu, 26 Oct 2023 14:09:26 +0200
Subject: [PATCH 1/3] Get version from tag if building from tag.

---
 scripts/get-version.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/get-version.sh b/scripts/get-version.sh
index 39b009b..5e6d65e 100755
--- a/scripts/get-version.sh
+++ b/scripts/get-version.sh
@@ -7,8 +7,11 @@ if [ -s "$ROOT/../version.txt" ]; then
     VERSION=$(cat "$ROOT/../version.txt" | tr -d '[:space:]')
 fi
 if [ -z $VERSION ] && [ -d "$ROOT/../.git" ]; then
+    TAG=$(git tag --points-at HEAD | sed 's/v//')
     if [ "$1" == "--tar" ]; then
         VERSION=$(git describe --dirty --tags --always | sed 's/debian\///g')
+    elif [ -n "$TAG" ]; then
+        VERSION="$TAG"
     else
         VERSION=$(git log -1 --pretty=%H)
     fi

From e972f911b06f884d151c73978b771d1657ac18dd Mon Sep 17 00:00:00 2001
From: Joachim Bauch <bauch@struktur.de>
Date: Thu, 26 Oct 2023 14:10:33 +0200
Subject: [PATCH 2/3] Use double quotes to prevent globbing and word splitting.

---
 scripts/get-version.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/get-version.sh b/scripts/get-version.sh
index 5e6d65e..94c3f0a 100755
--- a/scripts/get-version.sh
+++ b/scripts/get-version.sh
@@ -6,7 +6,7 @@ VERSION=
 if [ -s "$ROOT/../version.txt" ]; then
     VERSION=$(cat "$ROOT/../version.txt" | tr -d '[:space:]')
 fi
-if [ -z $VERSION ] && [ -d "$ROOT/../.git" ]; then
+if [ -z "$VERSION" ] && [ -d "$ROOT/../.git" ]; then
     TAG=$(git tag --points-at HEAD | sed 's/v//')
     if [ "$1" == "--tar" ]; then
         VERSION=$(git describe --dirty --tags --always | sed 's/debian\///g')
@@ -17,7 +17,7 @@ if [ -z $VERSION ] && [ -d "$ROOT/../.git" ]; then
     fi
 fi
 
-if [ -z $VERSION ]; then
+if [ -z "$VERSION" ]; then
     VERSION=unknown
 fi
 

From b1bd1a1f793dd22949815e0453f5f4c8f9fe164e Mon Sep 17 00:00:00 2001
From: Joachim Bauch <bauch@struktur.de>
Date: Thu, 26 Oct 2023 14:11:34 +0200
Subject: [PATCH 3/3] Remove useless "cat" invocation.

---
 scripts/get-version.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/get-version.sh b/scripts/get-version.sh
index 94c3f0a..2f1e024 100755
--- a/scripts/get-version.sh
+++ b/scripts/get-version.sh
@@ -4,7 +4,7 @@ ROOT="$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
 
 VERSION=
 if [ -s "$ROOT/../version.txt" ]; then
-    VERSION=$(cat "$ROOT/../version.txt" | tr -d '[:space:]')
+    VERSION=$(tr -d '[:space:]' < "$ROOT/../version.txt")
 fi
 if [ -z "$VERSION" ] && [ -d "$ROOT/../.git" ]; then
     TAG=$(git tag --points-at HEAD | sed 's/v//')