瀏覽代碼

macOS: Fix support for latest VulkanSDK .app name in install script

(cherry picked from commit efde4ae853fe2e76f403d5a56d5c19b5e51ba230)
Rémi Verschelde 4 月之前
父節點
當前提交
06a0eface3
共有 1 個文件被更改,包括 9 次插入6 次删除
  1. 9 6
      misc/scripts/install_vulkan_sdk_macos.sh

+ 9 - 6
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