From 75f8bee70670533c4c6ff0fd85466a6cb2029e62 Mon Sep 17 00:00:00 2001
From: William <will27528@gmail.com>
Date: Mon, 6 May 2024 17:05:52 +0100
Subject: [PATCH] build: adjust version meta for release builds

---
 build.gradle | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index fe8ae307..ac5dff76 100644
--- a/build.gradle
+++ b/build.gradle
@@ -168,11 +168,20 @@ logger.lifecycle("Building HuskSync ${version} by William278")
 
 @SuppressWarnings('GrMethodMayBeStatic')
 def versionMetadata() {
-    // Get the last commit hash and if it's a clean head
+    // Require grgit
     if (grgit == null) {
-        return '-' + System.getenv("GITHUB_RUN_NUMBER") ? 'build.' + System.getenv("GITHUB_RUN_NUMBER") : 'unknown'
+        return '-unknown'
     }
-    // If grgit DOES exist, get tag for this commit
+
+    // If unclean, return the last commit hash with -indev
+    if (!grgit.status().clean) {
+        return '-' + grgit.head().abbreviatedId  + '-indev'
+    }
+
+    // Otherwise if this matches a tag, return nothing
     def tag = grgit.tag.list().find { it.commit.id == grgit.head().id }
-    return '-' + grgit.head().abbreviatedId + (grgit.status().clean ? '' : '-indev')
+    if (tag != null) {
+        return ''
+    }
+    return '-' + grgit.head().abbreviatedId
 }