|
...
|
...
|
@@ -3,72 +3,16 @@ |
|
3
|
3
|
setlocal ENABLEEXTENSIONS
|
|
4
|
4
|
|
|
5
|
5
|
@ECHO Detecting Java version installed.
|
|
6
|
|
-:CHECK_JAVA_64
|
|
7
|
|
-@ECHO Detecting if it is 64 bit machine
|
|
8
|
|
-set KEY_NAME="HKEY_LOCAL_MACHINE\Software\Wow6432Node\JavaSoft\Java Runtime Environment"
|
|
9
|
|
-set VALUE_NAME=CurrentVersion
|
|
10
|
|
-
|
|
11
|
|
-FOR /F "usebackq skip=2 tokens=1-3" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO (
|
|
12
|
|
- set ValueName=%%A
|
|
13
|
|
- set ValueType=%%B
|
|
14
|
|
- set ValueValue=%%C
|
|
15
|
|
-)
|
|
16
|
|
-@ECHO CurrentVersion %ValueValue%
|
|
17
|
|
-
|
|
18
|
|
-SET KEY_NAME="%KEY_NAME:~1,-1%\%ValueValue%"
|
|
19
|
|
-SET VALUE_NAME=JavaHome
|
|
20
|
|
-
|
|
21
|
|
-if defined ValueName (
|
|
22
|
|
- FOR /F "usebackq skip=2 tokens=1,2*" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO (
|
|
23
|
|
- set ValueName2=%%A
|
|
24
|
|
- set ValueType2=%%B
|
|
25
|
|
- set JRE_PATH2=%%C
|
|
26
|
|
-
|
|
27
|
|
- if defined ValueName2 (
|
|
28
|
|
- set ValueName = %ValueName2%
|
|
29
|
|
- set ValueType = %ValueType2%
|
|
30
|
|
- set ValueValue = %JRE_PATH2%
|
|
31
|
|
- )
|
|
32
|
|
- )
|
|
33
|
|
-)
|
|
34
|
|
-
|
|
35
|
|
-IF NOT "%JRE_PATH2%" == "" GOTO JAVA_INSTALLED
|
|
|
6
|
+:CHECK_JAVA
|
|
|
7
|
+for /f tokens^=2-5^ delims^=.-_^" %%j in ('java -fullversion 2^>^&1') do set "jver=%%j%%k"
|
|
|
8
|
+@ECHO CurrentVersion %jver%
|
|
36
|
9
|
|
|
37
|
|
-:CHECK_JAVA_32
|
|
38
|
|
-@ECHO Detecting if it is 32 bit machine
|
|
39
|
|
-set KEY_NAME="HKEY_LOCAL_MACHINE\Software\JavaSoft\Java Runtime Environment"
|
|
40
|
|
-set VALUE_NAME=CurrentVersion
|
|
41
|
|
-
|
|
42
|
|
-FOR /F "usebackq skip=2 tokens=1-3" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO (
|
|
43
|
|
- set ValueName=%%A
|
|
44
|
|
- set ValueType=%%B
|
|
45
|
|
- set ValueValue=%%C
|
|
46
|
|
-)
|
|
47
|
|
-@ECHO CurrentVersion %ValueValue%
|
|
48
|
|
-
|
|
49
|
|
-SET KEY_NAME="%KEY_NAME:~1,-1%\%ValueValue%"
|
|
50
|
|
-SET VALUE_NAME=JavaHome
|
|
51
|
|
-
|
|
52
|
|
-if defined ValueName (
|
|
53
|
|
- FOR /F "usebackq skip=2 tokens=1,2*" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO (
|
|
54
|
|
- set ValueName2=%%A
|
|
55
|
|
- set ValueType2=%%B
|
|
56
|
|
- set JRE_PATH2=%%C
|
|
57
|
|
-
|
|
58
|
|
- if defined ValueName2 (
|
|
59
|
|
- set ValueName = %ValueName2%
|
|
60
|
|
- set ValueType = %ValueType2%
|
|
61
|
|
- set ValueValue = %JRE_PATH2%
|
|
62
|
|
- )
|
|
63
|
|
- )
|
|
64
|
|
-)
|
|
65
|
|
-
|
|
66
|
|
-IF "%JRE_PATH2%" == "" GOTO JAVA_NOT_INSTALLED
|
|
|
10
|
+if %jver% NEQ 18 GOTO JAVA_NOT_INSTALLED
|
|
67
|
11
|
|
|
68
|
12
|
:JAVA_INSTALLED
|
|
69
|
13
|
|
|
70
|
14
|
@ECHO Java 1.8 found!
|
|
71
|
|
-@ECHO Installing ${pkg.name} ...
|
|
|
15
|
+@ECHO Installing thingsboard ...
|
|
72
|
16
|
|
|
73
|
17
|
SET loadDemo=false
|
|
74
|
18
|
|
|
...
|
...
|
@@ -79,17 +23,17 @@ if "%1" == "--loadDemo" ( |
|
79
|
23
|
SET BASE=%~dp0
|
|
80
|
24
|
SET LOADER_PATH=%BASE%\conf,%BASE%\extensions
|
|
81
|
25
|
SET SQL_DATA_FOLDER=%BASE%\data\sql
|
|
82
|
|
-SET jarfile=%BASE%\lib\${pkg.name}.jar
|
|
|
26
|
+SET jarfile=%BASE%\lib\thingsboard.jar
|
|
83
|
27
|
SET installDir=%BASE%\data
|
|
84
|
28
|
|
|
85
|
|
-PUSHD %BASE%\conf
|
|
|
29
|
+PUSHD "%BASE%\conf"
|
|
86
|
30
|
|
|
87
|
|
-java -cp %jarfile% -Dloader.main=org.thingsboard.server.ThingsboardInstallApplication^
|
|
88
|
|
- -Dinstall.data_dir=%installDir%^
|
|
|
31
|
+java -cp "%jarfile%" -Dloader.main=org.thingsboard.server.ThingsboardInstallApplication^
|
|
|
32
|
+ -Dinstall.data_dir="%installDir%"^
|
|
89
|
33
|
-Dinstall.load_demo=%loadDemo%^
|
|
90
|
34
|
-Dspring.jpa.hibernate.ddl-auto=none^
|
|
91
|
35
|
-Dinstall.upgrade=false^
|
|
92
|
|
- -Dlogging.config=%BASE%\install\logback.xml^
|
|
|
36
|
+ -Dlogging.config="%BASE%\install\logback.xml"^
|
|
93
|
37
|
org.springframework.boot.loader.PropertiesLauncher
|
|
94
|
38
|
|
|
95
|
39
|
if errorlevel 1 (
|
|
...
|
...
|
@@ -99,18 +43,16 @@ if errorlevel 1 ( |
|
99
|
43
|
)
|
|
100
|
44
|
POPD
|
|
101
|
45
|
|
|
102
|
|
-%BASE%${pkg.name}.exe install
|
|
|
46
|
+%BASE%thingsboard.exe install
|
|
103
|
47
|
|
|
104
|
48
|
@ECHO ThingsBoard installed successfully!
|
|
105
|
49
|
|
|
106
|
50
|
GOTO END
|
|
107
|
51
|
|
|
108
|
52
|
:JAVA_NOT_INSTALLED
|
|
109
|
|
-@ECHO Java 1.8 or above is not installed
|
|
110
|
|
-@ECHO Please go to https://java.com/ and install Java. Then retry installation.
|
|
|
53
|
+@ECHO Java 1.8 is not installed. Only Java 1.8 is supported
|
|
|
54
|
+@ECHO Please go to https://adoptopenjdk.net/index.html and install Java 1.8. Then retry installation.
|
|
111
|
55
|
PAUSE
|
|
112
|
56
|
GOTO END
|
|
113
|
57
|
|
|
114
|
58
|
:END |
|
115
|
|
-
|
|
116
|
|
- |
...
|
...
|
|
