This is an automated email from the ASF dual-hosted git repository. hxd pushed a commit to branch startOnWin in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 81f4c6922eea59a5568a0f1365c99572a8e5995d Author: xiangdong huang <[email protected]> AuthorDate: Sun Apr 19 01:25:58 2020 +0800 fix start-client failed on WinOS if there is blank space in the file path; let start-server.bat suport jdk12,13 etc.. --- client/src/assembly/resources/sbin/start-client.bat | 6 +++--- server/src/assembly/resources/sbin/start-server.bat | 11 +++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/client/src/assembly/resources/sbin/start-client.bat b/client/src/assembly/resources/sbin/start-client.bat index 0ee4721..c0727cc 100755 --- a/client/src/assembly/resources/sbin/start-client.bat +++ b/client/src/assembly/resources/sbin/start-client.bat @@ -37,17 +37,17 @@ if NOT DEFINED JAVA_HOME goto :err @REM ----------------------------------------------------------------------------- @REM JVM Opts we'll use in legacy run or installation set JAVA_OPTS=-ea^ - -DIOTDB_CLI_HOME=%IOTDB_CLI_HOME% + -DIOTDB_CLI_HOME="%IOTDB_CLI_HOME%" REM For each jar in the IOTDB_CLI_HOME lib directory call append to build the CLASSPATH variable. -set CLASSPATH=%IOTDB_CLI_HOME%\lib\* +set CLASSPATH="%IOTDB_CLI_HOME%\lib\*" REM ----------------------------------------------------------------------------- set PARAMETERS=%* if "%PARAMETERS%" == "" set PARAMETERS=-h 127.0.0.1 -p 6667 -u root -pw root -"%JAVA_HOME%\bin\java" %JAVA_OPTS% -cp "%CLASSPATH%" %MAIN_CLASS% %PARAMETERS% +"%JAVA_HOME%\bin\java" %JAVA_OPTS% -cp %CLASSPATH% %MAIN_CLASS% %PARAMETERS% goto finally diff --git a/server/src/assembly/resources/sbin/start-server.bat b/server/src/assembly/resources/sbin/start-server.bat index 1ebf8e7..9410ed3 100755 --- a/server/src/assembly/resources/sbin/start-server.bat +++ b/server/src/assembly/resources/sbin/start-server.bat @@ -42,11 +42,14 @@ for /f tokens^=2-5^ delims^=.-_+^" %%j in ('java -fullversion 2^>^&1') do ( set JAVA_VERSION=%MAJOR_VERSION% -IF NOT "%JAVA_VERSION%" == "8" ( - IF NOT "%JAVA_VERSION%" == "11" ( - echo IoTDB only supports jdk8 or jdk11, please check your java version. +@REM we do not check jdk that version <1.6 because they are too stale... +IF "%JAVA_VERSION%" == "6" ( + echo IoTDB only supports jdk >= 8, please check your java version. + goto finally +) +IF "%JAVA_VERSION%" == "7" ( + echo IoTDB only supports jdk >= 8, please check your java version. goto finally - ) ) if "%OS%" == "Windows_NT" setlocal
