Minor fix for getting java executable

Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/2be69918
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/2be69918
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/2be69918

Branch: refs/heads/GROOVY_2_5_X
Commit: 2be69918ae7e5e5528629e2ea3cdd9336354b6f4
Parents: ccdbf1e
Author: sunlan <sun...@apache.org>
Authored: Fri Sep 22 16:34:00 2017 +0800
Committer: Paul King <pa...@asert.com.au>
Committed: Thu Jul 12 22:50:19 2018 +1000

----------------------------------------------------------------------
 src/bin/startGroovy.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/2be69918/src/bin/startGroovy.bat
----------------------------------------------------------------------
diff --git a/src/bin/startGroovy.bat b/src/bin/startGroovy.bat
index c2498ae..86007c4 100644
--- a/src/bin/startGroovy.bat
+++ b/src/bin/startGroovy.bat
@@ -266,7 +266,7 @@ if not "%TOOLS_JAR%" == "" set GROOVY_OPTS=%GROOVY_OPTS% 
-Dtools.jar="%TOOLS_JAR
 set GROOVY_OPTS=%GROOVY_OPTS% -Dgroovy.starter.conf="%STARTER_CONF%"
 set GROOVY_OPTS=%GROOVY_OPTS% -Dscript.name="%GROOVY_SCRIPT_NAME%"
 
-for /f "tokens=3" %%g in ('java -version 2^>^&1 ^| findstr /i "version"') do (
+for /f "tokens=3" %%g in ('%JAVA_EXE% -version 2^>^&1 ^| findstr /i 
"version"') do (
   SET JAVA_VERSION=%%g
 )
 for /f "useback tokens=*" %%a in ('%JAVA_VERSION%') do set JAVA_VERSION=%%~a

Reply via email to