From 4f4a78b1021a6c2d4fad10c8237c9ff2e34ba55d Mon Sep 17 00:00:00 2001
From: deadc0de6 <info@deadc0de.ch>
Date: Sun, 23 Apr 2023 08:14:09 +0200
Subject: [PATCH] fix snapcraft version

---
 .github/workflows/snapcraft-release.yml | 6 +++---
 packages/snap/snapcraft.yaml            | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/snapcraft-release.yml b/.github/workflows/snapcraft-release.yml
index 86d61fd..b1d4709 100644
--- a/.github/workflows/snapcraft-release.yml
+++ b/.github/workflows/snapcraft-release.yml
@@ -11,9 +11,9 @@ jobs:
     - name: snapcraft setup
       run: |
         pwd
-        cp "${GITHUB_WORKSPACE}/packages/snap/snapcraft.yaml" "${GITHUB_WORKSPACE}/snapcraft.yaml"
-        sed -i 's#source: ../../#source: \.#g' "${GITHUB_WORKSPACE}/snapcraft.yaml"
-        cat "${GITHUB_WORKSPACE}/snapcraft.yaml"
+        cp -r "./packages/snap" "."
+        sed -i 's#source: ../../#source: \.#g' "./snap/snapcraft.yaml"
+        cat "./snapcraft.yaml"
     - uses: snapcore/action-build@v1
       id: build
     - uses: snapcore/action-publish@v1
diff --git a/packages/snap/snapcraft.yaml b/packages/snap/snapcraft.yaml
index f8dd65e..97ba74a 100644
--- a/packages/snap/snapcraft.yaml
+++ b/packages/snap/snapcraft.yaml
@@ -40,4 +40,7 @@ parts:
     plugin: nil
     override-build: |
       VERSION=$(git describe --abbrev=0 --tags | sed 's/^v//g')
+      if [ -z ${VERSION} ]; then
+        VERSION=$(cat dotdrop/version.py | grep version | sed 's/^.*= .\(.*\).$/\1/g')
+      fi
       snapcraftctl set-version "${VERSION}"