未验证 提交 d4f2a49a 编写于 作者: X Xiangdong Huang 提交者: GitHub

[IOTDB-185]fix start-client failed on WinOS if there is blank space in the...

[IOTDB-185]fix start-client failed on WinOS if there is blank space in the file path; let start-server.bat suport jdk12,13 etc (#1069)

* fix start-client failed on WinOS if there is blank space in the file path; let start-server.bat suport jdk12,13 etc..
* remove '<' in the comment of Win Script.
上级 6f6c5c78
......@@ -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
......
......@@ -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 less than 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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册