From 06a0eface3bb6cf3510fc0980c527910600f6adf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 6 May 2025 18:40:40 +0200 Subject: [PATCH] macOS: Fix support for latest VulkanSDK .app name in install script (cherry picked from commit efde4ae853fe2e76f403d5a56d5c19b5e51ba230) --- misc/scripts/install_vulkan_sdk_macos.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/misc/scripts/install_vulkan_sdk_macos.sh b/misc/scripts/install_vulkan_sdk_macos.sh index ec5dfa54841..310c5fc8756 100755 --- a/misc/scripts/install_vulkan_sdk_macos.sh +++ b/misc/scripts/install_vulkan_sdk_macos.sh @@ -22,18 +22,21 @@ if command -v jq 2>&1 >/dev/null; then fi fi done +else + echo 'Error: Could not find 'jq' command. Is jq installed? Try running "brew install jq" or "port install jq" and rerunning this script.' + exit 1 fi # Download and install the Vulkan SDK. curl -L "https://sdk.lunarg.com/sdk/download/latest/mac/vulkan-sdk.zip" -o /tmp/vulkan-sdk.zip unzip /tmp/vulkan-sdk.zip -d /tmp -if [ -d "/tmp/InstallVulkan-$new_ver_full.app" ]; then - /tmp/InstallVulkan-$new_ver_full.app/Contents/MacOS/InstallVulkan-$new_ver_full --accept-licenses --default-answer --confirm-command install - rm -rf /tmp/InstallVulkan-$new_ver_full.app -elif [ -d "/tmp/InstallVulkan.app" ]; then - /tmp/InstallVulkan.app/Contents/MacOS/InstallVulkan --accept-licenses --default-answer --confirm-command install - rm -rf /tmp/InstallVulkan.app +if [ -d "/tmp/vulkansdk-macOS-$new_ver_full.app" ]; then + /tmp/vulkansdk-macOS-$new_ver_full.app/Contents/MacOS/vulkansdk-macOS-$new_ver_full --accept-licenses --default-answer --confirm-command install + rm -rf /tmp/vulkansdk-macOS-$new_ver_full.app +else + echo "Couldn't install the Vulkan SDK, the unzipped contents may no longer match what this script expects." + exit 1 fi rm -f /tmp/vulkan-sdk.zip