This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new dd971fe optimize JDK version checking in Win OS (#41)
dd971fe is described below
commit dd971fe8ad5607707860ed0f324be30cafad9a62
Author: Xiangdong Huang <[email protected]>
AuthorDate: Thu Feb 14 17:07:36 2019 +0800
optimize JDK version checking in Win OS (#41)
optimize start-server.bat to adapt jdk version like '11+28'
---
iotdb/iotdb/bin/start-server.bat | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/iotdb/iotdb/bin/start-server.bat b/iotdb/iotdb/bin/start-server.bat
index abf9ebc..2077797 100755
--- a/iotdb/iotdb/bin/start-server.bat
+++ b/iotdb/iotdb/bin/start-server.bat
@@ -23,18 +23,24 @@ echo Starting IoTDB
echo ````````````````````````
PATH %PATH%;%JAVA_HOME%\bin\
-for /f tokens^=2-5^ delims^=.-_^" %%j in ('java -fullversion 2^>^&1') do (
- set "FULL_VERSION=%%j%%k%%l%%m"
- set "MAJOR_VERSION=%%j"
- set "MINOR_VERSION=%%k"
+set "FULL_VERSION="
+set "MAJOR_VERSION="
+set "MINOR_VERSION="
+
+
+for /f tokens^=2-5^ delims^=.-_+^" %%j in ('java -fullversion 2^>^&1') do (
+ set "FULL_VERSION=%%j-%%k-%%l-%%m"
+ IF "%%j" == "1" (
+ set "MAJOR_VERSION=%%k"
+ set "MINOR_VERSION=%%l"
+ ) else (
+ set "MAJOR_VERSION=%%j"
+ set "MINOR_VERSION=%%k"
)
-
-IF "%MAJOR_VERSION%" == "1" (
- set JAVA_VERSION=%MINOR_VERSION%
-) else (
- set JAVA_VERSION=%MAJOR_VERSION%
)
+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.
