diff --git a/CMakeLists.txt b/CMakeLists.txt index 22064072..f0e53ba5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -158,7 +158,7 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES Darwin) set(CPACK_IFW_ROOT "~/Qt/Tools/QtInstallerFramework/4.5") set(CPACK_IFW_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/icons/favicon.icns") set(CPACK_PACKAGE_FILE_NAME "${COMPONENT_NAME_MAIN}-installer-darwin") - set(CPACK_IFW_TARGET_DIRECTORY "@HomeDir@/Applications/${COMPONENT_NAME_MAIN}") + set(CPACK_IFW_TARGET_DIRECTORY "@ApplicationsDir@/${COMPONENT_NAME_MAIN}") set(CPACK_BUNDLE_NAME ${COMPONENT_NAME_MAIN}) set(CPACK_BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/icons/favicon.icns") endif() @@ -168,7 +168,7 @@ set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR}) SET(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH}) set(CPACK_PACKAGE_HOMEPAGE_URL "https://gpt4all.io") -set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/icons/logo-48.png") +set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/icons/logo-256.png") set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE) set(CPACK_RESOURCE_FILE_README ${CMAKE_CURRENT_SOURCE_DIR}/README.md) set(CPACK_PACKAGE_EXECUTABLES "GPT4All") @@ -178,8 +178,8 @@ set(CPACK_IFW_PACKAGE_TITLE "GPT4All Installer") set(CPACK_IFW_PACKAGE_PUBLISHER "Nomic, Inc.") set(CPACK_IFW_PRODUCT_URL "https://gpt4all.io") set(CPACK_IFW_PACKAGE_WIZARD_STYLE "Aero") -set(CPACK_IFW_PACKAGE_LOGO "${CMAKE_CURRENT_SOURCE_DIR}/icons/logo-48.png") -set(CPACK_IFW_PACKAGE_WINDOW_ICON "${CMAKE_CURRENT_SOURCE_DIR}/icons/logo-32.png") +set(CPACK_IFW_PACKAGE_LOGO "${CMAKE_CURRENT_SOURCE_DIR}/icons/logo-256.png") +set(CPACK_IFW_PACKAGE_WINDOW_ICON "${CMAKE_CURRENT_SOURCE_DIR}/icons/logo-256.png") set(CPACK_IFW_PACKAGE_WIZARD_SHOW_PAGE_LIST OFF) include(CPack) diff --git a/cmake/installerscript.qs b/cmake/installerscript.qs index 9ce639da..a9ce58cb 100644 --- a/cmake/installerscript.qs +++ b/cmake/installerscript.qs @@ -31,7 +31,12 @@ Component.prototype.createOperations = function() "iconPath=" + targetDirectory + "/favicon.ico", "iconId=0", "description=Open GPT4All"); } else if (systemInfo.productType === "osx") { - targetDirectory += "/gpt4all.app/Contents/MacOS/" + var gpt4allAppPath = targetDirectory + "/gpt4all/gpt4all.app"; + var symlinkPath = targetDirectory + "/GPT4All.app"; + // Remove the symlink if it already exists + component.addOperation("Execute", "rm", "-f", symlinkPath); + // Create the symlink + component.addOperation("Execute", "ln", "-s", gpt4allAppPath, symlinkPath); } else { // linux var homeDir = installer.environmentVariable("HOME"); if (!installer.fileExists(homeDir + "/Desktop/GPT4All.desktop")) { diff --git a/icons/favicon.ico b/icons/favicon.ico index b8628143..ec2d0c90 100644 Binary files a/icons/favicon.ico and b/icons/favicon.ico differ diff --git a/icons/logo-48.png b/icons/logo-48.png index 3b5c55eb..8aec21c4 100644 Binary files a/icons/logo-48.png and b/icons/logo-48.png differ