snap: Fix detecting git commit version when a release version

Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
acassen · Jan 16, 2022 · 387fdf0 · 387fdf0
1 parent 2d285a6
commit 387fdf0
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -63,10 +63,12 @@ parts:
       - --disable-systemd
     override-build: |
       snapcraftctl build
+      VER=
       if [ -f lib/git-commit.h ]; then
-        VER=$(grep GIT_COMMIT lib/git-commit.h | cut -d'"' -f2)
-      else
-        VER=
+        COMMIT=`grep GIT_COMMIT lib/git-commit.h | wc -l || true`
+        if [ $COMMIT -eq 1 ]; then
+          VER=$(grep GIT_COMMIT lib/git-commit.h | cut -d'"' -f2)
+        fi
       fi
       if [ -z $VER ]; then
         VER=`grep "^AC_INIT" configure.ac | tr '[' ']' | cut -d']' -f4`