aboutsummaryrefslogtreecommitdiff
path: root/project/Win32BuildSetup
diff options
context:
space:
mode:
authorRechi <Rechi@users.noreply.github.com>2017-04-08 17:24:41 +0200
committerRechi <Rechi@users.noreply.github.com>2017-04-08 17:24:41 +0200
commitefb1b77f1685af799fe9534c5314ebd6640dd034 (patch)
tree2dd22eae61c7c16605363005f7bdd54c87ae0579 /project/Win32BuildSetup
parentaf3698bfa3c471a1b3156323ad4269cc4ef1dc8b (diff)
[windows] installer: call findstr with full path
Diffstat (limited to 'project/Win32BuildSetup')
-rw-r--r--project/Win32BuildSetup/genNsisInstaller.nsi12
1 files changed, 10 insertions, 2 deletions
diff --git a/project/Win32BuildSetup/genNsisInstaller.nsi b/project/Win32BuildSetup/genNsisInstaller.nsi
index f7c0a3764c..d1c92bc54b 100644
--- a/project/Win32BuildSetup/genNsisInstaller.nsi
+++ b/project/Win32BuildSetup/genNsisInstaller.nsi
@@ -361,8 +361,16 @@ Function .onInit
${OrIf} $1 == ""
MessageBox MB_OK|MB_ICONSTOP|MB_TOPMOST|MB_SETFOREGROUND "Unable to run the Windows program wmic.exe to verify that Windows Update KB$HotFixID is installed.$\nWmic is not installed correctly.$\nPlease fix this issue and try again to install Kodi."
Quit
- ${EndIf}
- nsExec::ExecToStack 'cmd /Q /C "%SYSTEMROOT%\System32\wbem\wmic.exe qfe get hotfixid | findstr "^KB$HotFixID[^0-9]""'
+ ${EndIf}
+ nsExec::ExecToStack 'cmd /Q /C "%SYSTEMROOT%\System32\findstr.exe /?"'
+ Pop $0 ; return value (it always 0 even if an error occured)
+ Pop $1 ; command output
+ ${If} $0 != 0
+ ${OrIf} $1 == ""
+ MessageBox MB_OK|MB_ICONSTOP|MB_TOPMOST|MB_SETFOREGROUND "Unable to run the Windows program findstr.exe to verify that Windows Update KB$HotFixID is installed.$\nFindstr is not installed correctly.$\nPlease fix this issue and try again to install Kodi."
+ Quit
+ ${EndIf}
+ nsExec::ExecToStack 'cmd /Q /C "%SYSTEMROOT%\System32\wbem\wmic.exe qfe get hotfixid | %SYSTEMROOT%\System32\findstr.exe "^KB$HotFixID[^0-9]""'
Pop $0 ; return value (it always 0 even if an error occured)
Pop $1 ; command output
${If} $0 != 0