From 508ca0cf5b0b8b12ca90b175a525bb46abad6877 Mon Sep 17 00:00:00 2001 From: "Mohanraj Sankar (MS/EOC1-XC)" Date: Sun, 12 Jul 2026 17:29:19 +0530 Subject: [PATCH 1/2] Fix Windows CLI to use JAVA_HOME when java is not on PATH --- cli/src/main/conf/windowsBinTemplate.bat | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cli/src/main/conf/windowsBinTemplate.bat b/cli/src/main/conf/windowsBinTemplate.bat index 18f3506ccf0..1bb217636fb 100644 --- a/cli/src/main/conf/windowsBinTemplate.bat +++ b/cli/src/main/conf/windowsBinTemplate.bat @@ -50,7 +50,13 @@ for %%i in ("%~dp0..") do set "BASEDIR=%%~fi" set REPO= #ENV_SETUP# -if "%JAVACMD%"=="" set JAVACMD=#JAVA_BINARY# +if "%JAVACMD%"=="" ( + if exist "%JAVA_HOME%\bin\java.exe" ( + set "JAVACMD=%JAVA_HOME%\bin\java.exe" + ) else ( + set "JAVACMD=#JAVA_BINARY#" + ) +) if "%REPO%"=="" set REPO=%BASEDIR%\#REPO# From bf029e32d9d04790b1a20c94ecfe383cbe052c46 Mon Sep 17 00:00:00 2001 From: mohan485 Date: Mon, 13 Jul 2026 16:40:11 +0530 Subject: [PATCH 2/2] fix: simplify JAVA_HOME fallback logic for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- cli/src/main/conf/windowsBinTemplate.bat | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/cli/src/main/conf/windowsBinTemplate.bat b/cli/src/main/conf/windowsBinTemplate.bat index 1bb217636fb..7f56df80811 100644 --- a/cli/src/main/conf/windowsBinTemplate.bat +++ b/cli/src/main/conf/windowsBinTemplate.bat @@ -51,11 +51,8 @@ set REPO= #ENV_SETUP# if "%JAVACMD%"=="" ( - if exist "%JAVA_HOME%\bin\java.exe" ( - set "JAVACMD=%JAVA_HOME%\bin\java.exe" - ) else ( - set "JAVACMD=#JAVA_BINARY#" - ) + set "JAVACMD=#JAVA_BINARY#" + if not "%JAVA_HOME%"=="" if exist "%JAVA_HOME%\bin\java.exe" set "JAVACMD=%JAVA_HOME%\bin\java.exe" ) if "%REPO%"=="" set REPO=%BASEDIR%\#REPO#