From 0a1283f94fb2b0b05034c75b93337d263d3ee295 Mon Sep 17 00:00:00 2001
From: t895 <clombardo169@gmail.com>
Date: Thu, 8 Feb 2024 14:24:15 -0500
Subject: android: Fix regex for git version

---
 src/android/app/build.gradle.kts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts
index d44bb4c74..cb026211c 100644
--- a/src/android/app/build.gradle.kts
+++ b/src/android/app/build.gradle.kts
@@ -259,13 +259,20 @@ fun runGitCommand(command: List<String>): String {
 }
 
 fun getGitVersion(): String {
-    val gitVersion = runGitCommand(listOf("git", "describe", "--always", "--long"))
+    val gitVersion = runGitCommand(
+        listOf(
+            "git",
+            "describe",
+            "--always",
+            "--long"
+        )
+    ).replace(Regex("(-0)?-[^-]+$"), "")
     val versionName = if (System.getenv("GITHUB_ACTIONS") != null) {
         System.getenv("GIT_TAG_NAME") ?: gitVersion
     } else {
         gitVersion
     }
-    return versionName.replace(Regex("(-0)?-[^-]+$"), "").ifEmpty { "0.0" }
+    return versionName.ifEmpty { "0.0" }
 }
 
 fun getGitHash(): String =
-- 
cgit v1.2.3