From 5d0b474a7e6a7f727bb5c1d1acb0a69335d8e37e Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Sat, 23 Mar 2024 00:33:46 +0100
Subject: [PATCH] build: Move renaming of the macOS bundle to the CI

---
 .github/workflows/build.yml | 2 ++
 cmake/build_helpers.cmake   | 4 +---
 dist/macOS/arm64.Dockerfile | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a95edf988..0890418e7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -226,6 +226,7 @@ jobs:
       run: |
         set -x
         cd build/install
+        mv imhex.app ImHex.app
         codesign --remove-signature ImHex.app
         codesign --force --deep --sign - ImHex.app
 
@@ -318,6 +319,7 @@ jobs:
         run: |
           set -x
           cd out
+          mv imhex.app ImHex.app
           codesign --remove-signature ImHex.app
           codesign --force --deep --sign - ImHex.app
 
diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
index 639a4fc7a..b869ba11b 100644
--- a/cmake/build_helpers.cmake
+++ b/cmake/build_helpers.cmake
@@ -118,7 +118,7 @@ macro(configurePackingResources)
         endif()
     elseif (APPLE OR ${CMAKE_HOST_SYSTEM_NAME} MATCHES "Darwin")
         set(IMHEX_ICON "${IMHEX_BASE_FOLDER}/resources/dist/macos/AppIcon.icns")
-        set(BUNDLE_NAME "ImHex.app")
+        set(BUNDLE_NAME "imhex.app")
 
         if (IMHEX_GENERATE_PACKAGE)
             set(APPLICATION_TYPE MACOSX_BUNDLE)
@@ -257,8 +257,6 @@ macro(createPackage)
             install(FILES ${IMHEX_ICON} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BUNDLE_NAME}/Contents/Resources")
             install(TARGETS main BUNDLE DESTINATION ".")
 
-            install(DIRECTORY "${CMAKE_INSTALL_PREFIX}/imhex.app/" DESTINATION "${CMAKE_INSTALL_PREFIX}/${BUNDLE_NAME}/" OPTIONAL)
-
             # Update library references to make the bundle portable
             postprocess_bundle(imhex_all main)
 
diff --git a/dist/macOS/arm64.Dockerfile b/dist/macOS/arm64.Dockerfile
index ce16975b0..3b5f737f6 100644
--- a/dist/macOS/arm64.Dockerfile
+++ b/dist/macOS/arm64.Dockerfile
@@ -170,4 +170,4 @@ EOF
 
 
 FROM scratch
-COPY --from=build /mnt/ImHex/build/install/ImHex.app ImHex.app
+COPY --from=build /mnt/ImHex/build/install/imhex.app imhex.app