From dda633cd0564985637fda0e91fd3f0b85a117415 Mon Sep 17 00:00:00 2001
From: Lykin <137850705+tiny-craft@users.noreply.github.com>
Date: Thu, 17 Jul 2025 11:34:26 +0800
Subject: [PATCH] fix: incorrect bundle name on macOS due to project name
 changed in wails.json

---
 .github/workflows/release-macos.yaml   | 1 +
 .github/workflows/release-windows.yaml | 4 ++--
 build/darwin/Info.dev.plist            | 2 +-
 build/darwin/Info.plist                | 2 +-
 wails.json                             | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release-macos.yaml b/.github/workflows/release-macos.yaml
index 0d3ade8..88aeb68 100644
--- a/.github/workflows/release-macos.yaml
+++ b/.github/workflows/release-macos.yaml
@@ -102,6 +102,7 @@ jobs:
         shell: bash
         working-directory: ./build
         run: |
+          mv bin/tinyrdm.app "bin/Tiny RDM.app"
           ./create-dmg/create-dmg \
             --no-internet-enable \
             --volname "Tiny RDM" \
diff --git a/.github/workflows/release-windows.yaml b/.github/workflows/release-windows.yaml
index f318db9..60f5afb 100644
--- a/.github/workflows/release-windows.yaml
+++ b/.github/workflows/release-windows.yaml
@@ -113,11 +113,11 @@ jobs:
           Set-Content -Path certificate\certificate.txt -Value '${{ secrets.WIN_SIGNING_CERT }}'
           certutil -decode certificate\certificate.txt certificate\certificate.pfx
           echo "Signing TinyRDM installer"
-          & 'C:/Program Files (x86)/Windows Kits/10/bin/10.0.17763.0/x86/signtool.exe' sign /td sha256 /tr http://timestamp.sectigo.com/?td=sha256 /f certificate\certificate.pfx /p '${{ secrets.WIN_SIGNING_CERT_PASSWORD }}' 'Tiny RDM-${{ steps.normalise_platform_name.outputs.pname }}-installer.exe'
+          & 'C:/Program Files (x86)/Windows Kits/10/bin/10.0.17763.0/x86/signtool.exe' sign /td sha256 /tr http://timestamp.sectigo.com/?td=sha256 /f certificate\certificate.pfx /p '${{ secrets.WIN_SIGNING_CERT_PASSWORD }}' 'TinyRDM-${{ steps.normalise_platform_name.outputs.pname }}-installer.exe'
 
       - name: Rename installer
         working-directory: ./build/bin
-        run: Rename-Item -Path "Tiny RDM-${{ steps.normalise_platform_name.outputs.pname }}-installer.exe" -NewName "TinyRDM_Setup_${{ steps.normalise_version.outputs.version }}_${{ steps.normalise_platform.outputs.tag }}.exe"
+        run: Rename-Item -Path "TinyRDM-${{ steps.normalise_platform_name.outputs.pname }}-installer.exe" -NewName "TinyRDM_Setup_${{ steps.normalise_version.outputs.version }}_${{ steps.normalise_platform.outputs.tag }}.exe"
 
       - name: Upload release asset (Installer)
         uses: softprops/action-gh-release@v1
diff --git a/build/darwin/Info.dev.plist b/build/darwin/Info.dev.plist
index 39cd98f..205fba0 100644
--- a/build/darwin/Info.dev.plist
+++ b/build/darwin/Info.dev.plist
@@ -6,7 +6,7 @@
         <key>CFBundleName</key>
         <string>{{.Info.ProductName}}</string>
         <key>CFBundleExecutable</key>
-        <string>{{.Name}}</string>
+        <string>{{.Info.ProductName}}</string>
         <key>CFBundleIdentifier</key>
         <string>com.tinycraft.{{.Name}}</string>
         <key>CFBundleVersion</key>
diff --git a/build/darwin/Info.plist b/build/darwin/Info.plist
index 8e7a732..6a2eb4c 100644
--- a/build/darwin/Info.plist
+++ b/build/darwin/Info.plist
@@ -6,7 +6,7 @@
         <key>CFBundleName</key>
         <string>{{.Info.ProductName}}</string>
         <key>CFBundleExecutable</key>
-        <string>{{.Name}}</string>
+        <string>{{.Info.ProductName}}</string>
         <key>CFBundleIdentifier</key>
         <string>com.tinycraft.{{.Name}}</string>
         <key>CFBundleVersion</key>
diff --git a/wails.json b/wails.json
index 549c40c..9ff8faa 100644
--- a/wails.json
+++ b/wails.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://wails.io/schemas/config.v2.json",
-  "name": "Tiny RDM",
+  "name": "tinyrdm",
   "outputfilename": "Tiny RDM",
   "frontend:install": "npm install",
   "frontend:build": "npm run build",