From 4ae7c833577e5005981ef258d73f1754b3209b83 Mon Sep 17 00:00:00 2001
From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com.>
Date: Fri, 13 Dec 2024 00:44:32 +0000
Subject: [PATCH] tests

---
 .github/workflows/multiOSReleases.yml | 10 +++++-----
 build.gradle                          |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/multiOSReleases.yml b/.github/workflows/multiOSReleases.yml
index 100396d0..6aa20977 100644
--- a/.github/workflows/multiOSReleases.yml
+++ b/.github/workflows/multiOSReleases.yml
@@ -59,9 +59,9 @@ jobs:
         run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
         shell: bash
 
-      - name: Get version number
+      - name: Get version number mac
         id: versionNumberMac
-        run: echo "versionNumberMac=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
+        run: echo "versionNumberMac=$(./gradlew printMacVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
         shell: bash
         
       # Build installer
@@ -77,11 +77,11 @@ jobs:
         shell: bash
         run: |
           if [ "${{ matrix.os }}" = "windows-latest" ]; then
-            mv "Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}.exe" "Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}-${{ matrix.platform }}.${{ matrix.ext }}"
+            mv "build/jpackage/Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}.exe" "Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}-${{ matrix.platform }}.${{ matrix.ext }}"
           elif [ "${{ matrix.os }}" = "macos-latest" ]; then
-            mv "Stirling-PDF-${{ steps.versionNumberMac.outputs.versionNumberMac }}.dmg" "Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}-${{ matrix.platform }}.${{ matrix.ext }}"
+            mv "build/jpackage/Stirling-PDF-${{ steps.versionNumberMac.outputs.versionNumberMac }}.dmg" "Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}-${{ matrix.platform }}.${{ matrix.ext }}"
           else
-            mv "stirlingpdf_${{ steps.versionNumber.outputs.versionNumber }}-1_amd64.deb" "Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}-${{ matrix.platform }}.${{ matrix.ext }}"
+            mv "build/jpackage/stirling-pdf_${{ steps.versionNumber.outputs.versionNumber }}-1_amd64.deb" "Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}-${{ matrix.platform }}.${{ matrix.ext }}"
           fi
 
       # Upload installer as artifact for testing
diff --git a/build.gradle b/build.gradle
index d2eee9a9..c6b73655 100644
--- a/build.gradle
+++ b/build.gradle
@@ -122,6 +122,8 @@ jpackage {
 
     // Enable verbose output
     verbose = true
+    
+    destinationDir = file("${projectDir}/build/jpackage")
 
     // Windows-specific configuration
     windows {