From 823b5183f199d907d2dcc228ba9a8b51f650d171 Mon Sep 17 00:00:00 2001 From: Christian Ullrich Date: Sun, 2 Dec 2018 10:41:45 +0100 Subject: [PATCH 1/2] Avoid trailing space in hhc file name if found on PATH. --- Doc/make.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/make.bat b/Doc/make.bat index d28dae78e86d4f..2047e4de2d4636 100644 --- a/Doc/make.bat +++ b/Doc/make.bat @@ -41,7 +41,7 @@ if exist "%HTMLHELP%" goto :skiphhcsearch rem Search for HHC in likely places set HTMLHELP= -where hhc /q && set HTMLHELP=hhc && goto :skiphhcsearch +where hhc /q && set HTMLHELP=hhc&& goto :skiphhcsearch where /R ..\externals hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc" if not exist "%HTMLHELP%" where /R "%ProgramFiles(x86)%" hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc" if not exist "%HTMLHELP%" where /R "%ProgramFiles%" hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc" From d15a0e31ce10f768a569c518aa9100ef019f1b72 Mon Sep 17 00:00:00 2001 From: Christian Ullrich Date: Sun, 2 Dec 2018 13:46:09 +0100 Subject: [PATCH 2/2] Improve readability. --- Doc/make.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/make.bat b/Doc/make.bat index 2047e4de2d4636..ca89f21708203a 100644 --- a/Doc/make.bat +++ b/Doc/make.bat @@ -41,7 +41,7 @@ if exist "%HTMLHELP%" goto :skiphhcsearch rem Search for HHC in likely places set HTMLHELP= -where hhc /q && set HTMLHELP=hhc&& goto :skiphhcsearch +where hhc /q && set "HTMLHELP=hhc" && goto :skiphhcsearch where /R ..\externals hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc" if not exist "%HTMLHELP%" where /R "%ProgramFiles(x86)%" hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc" if not exist "%HTMLHELP%" where /R "%ProgramFiles%" hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc"