From 7b986c4f85954ed4065507897c8058a712b70c05 Mon Sep 17 00:00:00 2001 From: David Pinedo Date: Fri, 10 Jun 2016 08:01:56 -0600 Subject: [PATCH] winrtinstaller: display error num in ps warning window Display an error number in warning window if powershell script fails. --- windowsRuntimeInstaller/InstallerRT.nsi | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/windowsRuntimeInstaller/InstallerRT.nsi b/windowsRuntimeInstaller/InstallerRT.nsi index 5d8b3f1..462cbb8 100644 --- a/windowsRuntimeInstaller/InstallerRT.nsi +++ b/windowsRuntimeInstaller/InstallerRT.nsi @@ -260,10 +260,15 @@ Function ${un}ConfigLayersAndVulkanDLL # Read the return value of the script and put it in $0, stripping trailing newline FileOpen $1 "$TEMP\ConfigLayersAndVulkanDLL.stat" r - FileRead $1 $2 - FileClose $1 - ${StrRep} $3 $2 "$\n" "" - ${StrRep} $0 $3 "$\r" "" + ${If} $1 != "" + FileRead $1 $2 + FileClose $1 + ${StrRep} $3 $2 "$\n" "" + ${StrRep} $0 $3 "$\r" "" + ${Else} + # error + StrCpy $0 -1 + ${Endif} # Cleanup Delete "$TEMP\ConfigLayersAndVulkanDLL.stat" -- 2.7.4