Commit ea32b2d29ea97fd47e7b8ccd96476e2b1c508ba1
Committed by
GitHub
GitHub
Merge pull request #112 from thingsboard/bug/TB-51
TB-51: Fix java version check procedure in windows installation script.
Showing
1 changed file
with
0 additions
and
4 deletions
| @@ -2,9 +2,6 @@ | @@ -2,9 +2,6 @@ | ||
| 2 | 2 | ||
| 3 | setlocal ENABLEEXTENSIONS | 3 | setlocal ENABLEEXTENSIONS |
| 4 | 4 | ||
| 5 | -IF %PROCESSOR_ARCHITECTURE%==AMD64 GOTO CHECK_JAVA_64 | ||
| 6 | -IF %PROCESSOR_ARCHITECTURE%==x86 GOTO CHECK_JAVA_32 | ||
| 7 | - | ||
| 8 | @ECHO Detecting Java version installed. | 5 | @ECHO Detecting Java version installed. |
| 9 | :CHECK_JAVA_64 | 6 | :CHECK_JAVA_64 |
| 10 | @ECHO Detecting if it is 64 bit machine | 7 | @ECHO Detecting if it is 64 bit machine |
| @@ -36,7 +33,6 @@ if defined ValueName ( | @@ -36,7 +33,6 @@ if defined ValueName ( | ||
| 36 | ) | 33 | ) |
| 37 | 34 | ||
| 38 | IF NOT "%JRE_PATH2%" == "" GOTO JAVA_INSTALLED | 35 | IF NOT "%JRE_PATH2%" == "" GOTO JAVA_INSTALLED |
| 39 | -IF "%JRE_PATH2%" == "" GOTO JAVA_NOT_INSTALLED | ||
| 40 | 36 | ||
| 41 | :CHECK_JAVA_32 | 37 | :CHECK_JAVA_32 |
| 42 | @ECHO Detecting if it is 32 bit machine | 38 | @ECHO Detecting if it is 32 bit machine |