From 2f23eb69c6cf4d8d2044300b5646c4d6ed565a58 Mon Sep 17 00:00:00 2001
From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com.>
Date: Thu, 12 Dec 2024 23:40:49 +0000
Subject: [PATCH] naming

---
 .github/workflows/multiOSReleases.yml | 15 +++++++++------
 build.gradle                          |  3 +++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/multiOSReleases.yml b/.github/workflows/multiOSReleases.yml
index d0f56c5e..6b834a80 100644
--- a/.github/workflows/multiOSReleases.yml
+++ b/.github/workflows/multiOSReleases.yml
@@ -54,11 +54,14 @@ jobs:
           sudo apt-get install -y fakeroot rpm
 
       # Get version number
-      - name: Get version number
-        id: versionNumber
-        run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
+      - name: Get version numbers
+        id: versions
+        run: |
+          echo "version=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
+          echo "macversion=$(./gradlew printMacVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
         shell: bash
 
+
       # Build installer
       - name: Build Installer
         run: ./gradlew build jpackage --info
@@ -69,11 +72,11 @@ jobs:
         shell: bash
         run: |
           if [ "${{ matrix.os }}" = "windows-latest" ]; then
-            mv Stirling-PDF.exe "Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}-${{ matrix.platform }}.${{ matrix.ext }}"
+            mv "Stirling-PDF-${{ steps.versions.outputs.version }}.exe" "Stirling-PDF-${{ steps.versions.outputs.version }}-${{ matrix.platform }}.${{ matrix.ext }}"
           elif [ "${{ matrix.os }}" = "macos-latest" ]; then
-            mv build/jpackage/Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}.dmg "Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}-${{ matrix.platform }}.${{ matrix.ext }}"
+            mv "Stirling-PDF-${{ steps.versions.outputs.macversion }}.dmg" "Stirling-PDF-${{ steps.versions.outputs.version }}-${{ matrix.platform }}.${{ matrix.ext }}"
           else
-            mv build/jpackage/stirling-pdf_${{ steps.versionNumber.outputs.versionNumber }}-1_amd64.deb "Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}-${{ matrix.platform }}.${{ matrix.ext }}"
+            mv "stirlingpdf_${{ steps.versions.outputs.version }}-1_amd64.deb" "Stirling-PDF-${{ steps.versions.outputs.version }}-${{ matrix.platform }}.${{ matrix.ext }}"
           fi
 
       # Upload installer as artifact for testing
diff --git a/build.gradle b/build.gradle
index e5e8aefa..fe13370c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -425,3 +425,6 @@ tasks.named("test") {
 task printVersion {
     println project.version
 }
+task printMacVersion {
+    println getMacVersion(project.version.toString())
+}