[iotdb] branch master updated: fix(cli-windows): Ensure that any user defined CLASSPATH variables are not used on startup (#11316)

[haonan]

This is an automated email from the ASF dual-hosted git repository.

haonan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 676a21bacbd fix(cli-windows): Ensure that any user defined CLASSPATH 
variables are not used on startup (#11316)
676a21bacbd is described below

commit 676a21bacbd87841d9c2eb3507a4fa4a0221eb1f
Author: CritasWang <cri...@outlook.com>
AuthorDate: Mon Oct 16 02:51:16 2023 -0500

    fix(cli-windows): Ensure that any user defined CLASSPATH variables are not 
used on startup (#11316)
---
 .../cli/src/assembly/resources/sbin/start-cli.bat        | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/iotdb-client/cli/src/assembly/resources/sbin/start-cli.bat 
b/iotdb-client/cli/src/assembly/resources/sbin/start-cli.bat
index ddaa62d1f5b..56d66b39136 100644
--- a/iotdb-client/cli/src/assembly/resources/sbin/start-cli.bat
+++ b/iotdb-client/cli/src/assembly/resources/sbin/start-cli.bat
@@ -22,6 +22,8 @@
 @REM You can put your env variable here
 @REM set JAVA_HOME=%JAVA_HOME%
 
+set PATH="%JAVA_HOME%\bin\";%PATH%
+
 if "%OS%" == "Windows_NT" setlocal
 
 pushd %~dp0..
@@ -36,10 +38,18 @@ if NOT DEFINED JAVA_HOME goto :err
 set JAVA_OPTS=-ea^
  -DIOTDB_HOME="%IOTDB_HOME%"
 
-REM For each jar in the IOTDB_HOME lib directory call append to build the 
CLASSPATH variable.
-if EXIST %IOTDB_HOME%\lib (set CLASSPATH=%CLASSPATH%;"%IOTDB_HOME%\lib\*") 
else set CLASSPATH=%CLASSPATH%;"%IOTDB_HOME%\..\lib\*"
+@REM ***** CLASSPATH library setting *****
+@REM Ensure that any user defined CLASSPATH variables are not used on startup
+if EXIST %IOTDB_HOME%\lib (set CLASSPATH="%IOTDB_HOME%\lib\*") else set 
CLASSPATH="%IOTDB_HOME%\..\lib\*"
+goto okClasspath
+
+:append
+set CLASSPATH=%CLASSPATH%;%1
+
+goto :eof
 
 REM 
-----------------------------------------------------------------------------
+:okClasspath
 set PARAMETERS=%*
 
 @REM if "%PARAMETERS%" == "" set PARAMETERS=-h 127.0.0.1 -p 6667 -u root -pw 
root
@@ -58,7 +68,7 @@ echo %PARAMETERS% | findstr /c:"-h ">nul && (set 
PARAMETERS=%PARAMETERS%) || (se
 
 echo %PARAMETERS%
 
-"%JAVA_HOME%\bin\java" %JAVA_OPTS% -cp %CLASSPATH% %MAIN_CLASS% %PARAMETERS%
+java %JAVA_OPTS% -cp %CLASSPATH% %MAIN_CLASS% %PARAMETERS%
 set ret_code=%ERRORLEVEL%
 goto finally