From d9463620e601aa62342cafc3fb2fbeae5f56511c Mon Sep 17 00:00:00 2001
From: tobimori <tobias@moeritz.cc>
Date: Tue, 25 Oct 2022 09:34:07 +0200
Subject: [PATCH] move .app rename to packaging process, update mac copyright
 string

Signed-off-by: tobimori <tobias@moeritz.cc>
---
 .github/workflows/build.yml |  5 +++--
 CMakeLists.txt              | 16 ++++++++--------
 program_info/CMakeLists.txt |  1 +
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f67ba4c7..ac701c1e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -249,8 +249,9 @@ jobs:
           cmake --install ${{ env.BUILD_DIR }}
 
           cd ${{ env.INSTALL_DIR }}
-          chmod +x "Prism Launcher.app/Contents/MacOS/prismlauncher"
-          sudo codesign --sign - --deep --force --entitlements "../program_info/App.entitlements" --options runtime "Prism Launcher.app/Contents/MacOS/prismlauncher"
+          chmod +x "PrismLauncher.app/Contents/MacOS/prismlauncher"
+          sudo codesign --sign - --deep --force --entitlements "../program_info/App.entitlements" --options runtime "PrismLauncher.app/Contents/MacOS/prismlauncher"
+          mv "PrismLauncher.app" "Prism Launcher.app"
           tar -czf ../PrismLauncher.tar.gz *
 
       - name: Make Sparkle signature (macOS)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09f62bb3..611ca1de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -211,15 +211,15 @@ if(NOT (UNIX AND APPLE))
 endif()
 
 if(UNIX AND APPLE)
-    set(BINARY_DEST_DIR "${Launcher_DisplayName}.app/Contents/MacOS")
-    set(LIBRARY_DEST_DIR "${Launcher_DisplayName}.app/Contents/MacOS")
-    set(PLUGIN_DEST_DIR "${Launcher_DisplayName}.app/Contents/MacOS")
-    set(FRAMEWORK_DEST_DIR "${Launcher_DisplayName}.app/Contents/Frameworks")
-    set(RESOURCES_DEST_DIR "${Launcher_DisplayName}.app/Contents/Resources")
-    set(JARS_DEST_DIR "${Launcher_DisplayName}.app/Contents/MacOS/jars")
+    set(BINARY_DEST_DIR "${Launcher_Name}.app/Contents/MacOS")
+    set(LIBRARY_DEST_DIR "${Launcher_Name}.app/Contents/MacOS")
+    set(PLUGIN_DEST_DIR "${Launcher_Name}.app/Contents/MacOS")
+    set(FRAMEWORK_DEST_DIR "${Launcher_Name}.app/Contents/Frameworks")
+    set(RESOURCES_DEST_DIR "${Launcher_Name}.app/Contents/Resources")
+    set(JARS_DEST_DIR "${Launcher_Name}.app/Contents/MacOS/jars")
 
     # Apps to bundle
-    set(APPS "\${CMAKE_INSTALL_PREFIX}/${Launcher_DisplayName}.app")
+    set(APPS "\${CMAKE_INSTALL_PREFIX}/${Launcher_Name}.app")
 
     # Mac bundle settings
     set(MACOSX_BUNDLE_BUNDLE_NAME "${Launcher_DisplayName}")
@@ -229,7 +229,7 @@ if(UNIX AND APPLE)
     set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${Launcher_VERSION_NAME}")
     set(MACOSX_BUNDLE_LONG_VERSION_STRING "${Launcher_VERSION_NAME}")
     set(MACOSX_BUNDLE_ICON_FILE ${Launcher_Name}.icns)
-    set(MACOSX_BUNDLE_COPYRIGHT "Copyright 2021-2022 ${Launcher_Copyright}")
+    set(MACOSX_BUNDLE_COPYRIGHT "© 2021-2022 ${Launcher_Copyright_Mac}")
     set(MACOSX_SPARKLE_UPDATE_PUBLIC_KEY "v55ZWWD6QlPoXGV6VLzOTZxZUggWeE51X8cRQyQh6vA=")
     set(MACOSX_SPARKLE_UPDATE_FEED_URL "https://prismlauncher.org/feed/appcast.xml")
 
diff --git a/program_info/CMakeLists.txt b/program_info/CMakeLists.txt
index f6e2ea84..61949e13 100644
--- a/program_info/CMakeLists.txt
+++ b/program_info/CMakeLists.txt
@@ -15,6 +15,7 @@ set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE)
 set(Launcher_DisplayName "${Launcher_DisplayName}" PARENT_SCOPE)
 
 set(Launcher_Copyright "Prism Launcher Contributors\\n© 2021-2022 PolyMC Contributors \\n© 2012-2021 MultiMC Contributors")
+set(Launcher_Copyright_Mac "Prism Launcher Contributors, © 2021-2022 PolyMC Contributors and © 2012-2021 MultiMC Contributors" PARENT_SCOPE)
 set(Launcher_Copyright "${Launcher_Copyright}" PARENT_SCOPE)
 set(Launcher_Domain "prismlauncher.org" PARENT_SCOPE)
 set(Launcher_UserAgent "${Launcher_CommonName}/${Launcher_VERSION_NAME}" PARENT_SCOPE)