From aaaac0f034409c2fa3e00eea44a31f53c691cd7e Mon Sep 17 00:00:00 2001
From: Lee Miller <lee.miller@tutanota.com>
Date: Fri, 10 Mar 2023 05:36:30 +0200
Subject: [PATCH] Append commit abbreviation to the snap version for
 non-release builds

---
 packages/snap/snapcraft.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/snap/snapcraft.yaml b/packages/snap/snapcraft.yaml
index cc3e54fc..47c27936 100644
--- a/packages/snap/snapcraft.yaml
+++ b/packages/snap/snapcraft.yaml
@@ -28,7 +28,7 @@ parts:
     source: https://github.com/Bitmessage/PyBitmessage.git
     override-pull: |
       snapcraftctl pull
-      snapcraftctl set-version $(git describe --tags --abbrev=0 | tr -d v)
+      snapcraftctl set-version $(git describe --tags | cut -d- -f1,3 | tr -d v)
     plugin: python
     python-version: python2
     build-packages: