From c93722ec05fb86cd268df2727a3de8313549386b Mon Sep 17 00:00:00 2001
From: Dario Ghunney Ware <dariogware@gmail.com>
Date: Wed, 9 Apr 2025 15:04:45 +0100
Subject: [PATCH] Fix for MacOS x86_64 Installer (#3314)

-  Updated workflow step to log jpackage dir


![8650580c23be5909c054034cc810b84d](https://github.com/user-attachments/assets/602ec9f9-74dc-400b-bbf1-062e3c29f49d)


![757ec0a397163b9af138c040351d87d5](https://github.com/user-attachments/assets/0b207fba-d640-4276-9d7e-8132711d915a)

---

## Checklist

### General

- [x] I have read the [Contribution
Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md)
- [x] I have read the [Stirling-PDF Developer
Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md)
(if applicable)
- [x] I have read the [How to add new languages to
Stirling-PDF](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md)
(if applicable)
- [x] I have performed a self-review of my own code
- [x] My changes generate no new warnings

### Documentation

- [x] I have updated relevant docs on [Stirling-PDF's doc
repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/)
(if functionality has heavily changed)
- [x] I have read the section [Add New Translation
Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags)
(for new translation tags only)

### UI Changes (if applicable)

- [x] Screenshots or videos demonstrating the UI changes are attached
(e.g., as comments or direct attachments in the PR)

### Testing (if applicable)

- [x] I have tested my changes locally. Refer to the [Testing
Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md#6-testing)
for more details.
---
 .github/workflows/multiOSReleases.yml |  1 +
 build.gradle                          | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/multiOSReleases.yml b/.github/workflows/multiOSReleases.yml
index 3667c46c2..f2c8867de 100644
--- a/.github/workflows/multiOSReleases.yml
+++ b/.github/workflows/multiOSReleases.yml
@@ -175,6 +175,7 @@ jobs:
         id: prepare
         shell: bash
         run: |
+          ls -lah ./build/jpackage/
           mkdir ./binaries
           if [ "${{ matrix.os }}" = "windows-latest" ]; then
             mv "./build/jpackage/Stirling-PDF-${{ needs.read_versions.outputs.version }}.exe" "./binaries/Stirling-PDF-win-installer.exe"
diff --git a/build.gradle b/build.gradle
index 3e0664c73..6e2488b2b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -165,7 +165,7 @@ jpackage {
         icon = "src/main/resources/static/favicon.icns"
         type = "dmg"
         macPackageIdentifier = "com.stirling.software.pdf"
-        macPackageName = "Stirling-PDF_aarch64"
+        macPackageName = "Stirling-PDF-aarch64"
         macAppCategory = "public.app-category.productivity"
         macSign = false // Enable signing
         macAppStore = false // Not targeting App Store initially
@@ -230,6 +230,8 @@ tasks.register('jpackageMacX64') {
     group = 'distribution'
     description = 'Packages app for MacOS x86_64'
 
+    println "Running jpackageMacX64 task"
+
     if (OperatingSystem.current().isMacOsX()) {
         println "MacOS detected. Downloading temp JRE."
         dependsOn("downloadTempJre")
@@ -270,11 +272,11 @@ tasks.register('jpackageMacX64') {
         def stderr = errorStream.toString("UTF-8")
 
         if (!stdout.isBlank()) {
-            println "📝 jpackage stdout:\n$stdout"
+            println "jpackage stdout:\n$stdout"
         }
 
         if (result.exitValue != 0) {
-            throw new GradleException("❌ jpackage failed with exit code ${result.exitValue}.\n\n$stderr")
+            throw new GradleException("jpackage failed with exit code ${result.exitValue}.\n\n$stderr")
         }
     }
 }
@@ -322,7 +324,7 @@ tasks.register('cleanTempJre') {
         def path = project.ext.tempJrePath
 
         if (path && new File("$path").exists()) {
-            println "🧹 Cleaning up temporary JRE: $path"
+            println "Cleaning up temporary JRE: $path"
             new File("$path").parentFile.deleteDir()
         }
     }