Fix windows install scripts.
This commit is contained in:
parent
2f4d13c7de
commit
a01bc65c45
@ -22,7 +22,7 @@ setlocal ENABLEEXTENSIONS
|
|||||||
|
|
||||||
SET BASE=%~dp0
|
SET BASE=%~dp0
|
||||||
|
|
||||||
%BASE%${pkg.name}.exe install
|
"%BASE%$"{pkg.name}.exe install
|
||||||
|
|
||||||
@ECHO ${pkg.name} installed successfully!
|
@ECHO ${pkg.name} installed successfully!
|
||||||
|
|
||||||
|
|||||||
@ -20,6 +20,6 @@
|
|||||||
net stop ${pkg.name}
|
net stop ${pkg.name}
|
||||||
|
|
||||||
@ECHO Uninstalling ${pkg.name} ...
|
@ECHO Uninstalling ${pkg.name} ...
|
||||||
%~dp0${pkg.name}.exe uninstall
|
"%~dp0$"{pkg.name}.exe uninstall
|
||||||
|
|
||||||
@ECHO DONE.
|
@ECHO DONE.
|
||||||
@ -22,7 +22,7 @@ setlocal ENABLEEXTENSIONS
|
|||||||
|
|
||||||
SET BASE=%~dp0
|
SET BASE=%~dp0
|
||||||
|
|
||||||
%BASE%${pkg.name}.exe install
|
"%BASE%$"{pkg.name}.exe install
|
||||||
|
|
||||||
@ECHO ${pkg.name} installed successfully!
|
@ECHO ${pkg.name} installed successfully!
|
||||||
|
|
||||||
|
|||||||
@ -20,6 +20,6 @@
|
|||||||
net stop ${pkg.name}
|
net stop ${pkg.name}
|
||||||
|
|
||||||
@ECHO Uninstalling ${pkg.name} ...
|
@ECHO Uninstalling ${pkg.name} ...
|
||||||
%~dp0${pkg.name}.exe uninstall
|
"%~dp0$"{pkg.name}.exe uninstall
|
||||||
|
|
||||||
@ECHO DONE.
|
@ECHO DONE.
|
||||||
@ -3,82 +3,26 @@
|
|||||||
setlocal ENABLEEXTENSIONS
|
setlocal ENABLEEXTENSIONS
|
||||||
|
|
||||||
@ECHO Detecting Java version installed.
|
@ECHO Detecting Java version installed.
|
||||||
:CHECK_JAVA_64
|
:CHECK_JAVA
|
||||||
@ECHO Detecting if it is 64 bit machine
|
for /f tokens^=2-5^ delims^=.-_^" %%j in ('java -fullversion 2^>^&1') do set "jver=%%j%%k"
|
||||||
set KEY_NAME="HKEY_LOCAL_MACHINE\Software\Wow6432Node\JavaSoft\Java Runtime Environment"
|
@ECHO CurrentVersion %jver%
|
||||||
set VALUE_NAME=CurrentVersion
|
|
||||||
|
|
||||||
FOR /F "usebackq skip=2 tokens=1-3" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO (
|
if %jver% NEQ 18 GOTO JAVA_NOT_INSTALLED
|
||||||
set ValueName=%%A
|
|
||||||
set ValueType=%%B
|
|
||||||
set ValueValue=%%C
|
|
||||||
)
|
|
||||||
@ECHO CurrentVersion %ValueValue%
|
|
||||||
|
|
||||||
SET KEY_NAME="%KEY_NAME:~1,-1%\%ValueValue%"
|
|
||||||
SET VALUE_NAME=JavaHome
|
|
||||||
|
|
||||||
if defined ValueName (
|
|
||||||
FOR /F "usebackq skip=2 tokens=1,2*" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO (
|
|
||||||
set ValueName2=%%A
|
|
||||||
set ValueType2=%%B
|
|
||||||
set JRE_PATH2=%%C
|
|
||||||
|
|
||||||
if defined ValueName2 (
|
|
||||||
set ValueName = %ValueName2%
|
|
||||||
set ValueType = %ValueType2%
|
|
||||||
set ValueValue = %JRE_PATH2%
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
IF NOT "%JRE_PATH2%" == "" GOTO JAVA_INSTALLED
|
|
||||||
|
|
||||||
:CHECK_JAVA_32
|
|
||||||
@ECHO Detecting if it is 32 bit machine
|
|
||||||
set KEY_NAME="HKEY_LOCAL_MACHINE\Software\JavaSoft\Java Runtime Environment"
|
|
||||||
set VALUE_NAME=CurrentVersion
|
|
||||||
|
|
||||||
FOR /F "usebackq skip=2 tokens=1-3" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO (
|
|
||||||
set ValueName=%%A
|
|
||||||
set ValueType=%%B
|
|
||||||
set ValueValue=%%C
|
|
||||||
)
|
|
||||||
@ECHO CurrentVersion %ValueValue%
|
|
||||||
|
|
||||||
SET KEY_NAME="%KEY_NAME:~1,-1%\%ValueValue%"
|
|
||||||
SET VALUE_NAME=JavaHome
|
|
||||||
|
|
||||||
if defined ValueName (
|
|
||||||
FOR /F "usebackq skip=2 tokens=1,2*" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO (
|
|
||||||
set ValueName2=%%A
|
|
||||||
set ValueType2=%%B
|
|
||||||
set JRE_PATH2=%%C
|
|
||||||
|
|
||||||
if defined ValueName2 (
|
|
||||||
set ValueName = %ValueName2%
|
|
||||||
set ValueType = %ValueType2%
|
|
||||||
set ValueValue = %JRE_PATH2%
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
IF "%JRE_PATH2%" == "" GOTO JAVA_NOT_INSTALLED
|
|
||||||
|
|
||||||
:JAVA_INSTALLED
|
:JAVA_INSTALLED
|
||||||
|
|
||||||
@ECHO Java 1.8 found!
|
@ECHO Java 1.8 found!
|
||||||
@ECHO Installing ${pkg.name} ...
|
@ECHO Installing ${pkg.name} ...
|
||||||
|
|
||||||
%BASE%${pkg.name}.exe install
|
"%BASE%$"{pkg.name}.exe install
|
||||||
|
|
||||||
@ECHO ${pkg.name} installed successfully!
|
@ECHO ${pkg.name} installed successfully!
|
||||||
|
|
||||||
GOTO END
|
GOTO END
|
||||||
|
|
||||||
:JAVA_NOT_INSTALLED
|
:JAVA_NOT_INSTALLED
|
||||||
@ECHO Java 1.8 or above is not installed
|
@ECHO Java 1.8 is not installed. Only Java 1.8 is supported
|
||||||
@ECHO Please go to https://java.com/ and install Java. Then retry installation.
|
@ECHO Please go to https://adoptopenjdk.net/index.html and install Java 1.8. Then retry installation.
|
||||||
PAUSE
|
PAUSE
|
||||||
GOTO END
|
GOTO END
|
||||||
|
|
||||||
|
|||||||
@ -4,6 +4,6 @@
|
|||||||
net stop ${pkg.name}
|
net stop ${pkg.name}
|
||||||
|
|
||||||
@ECHO Uninstalling ${pkg.name} ...
|
@ECHO Uninstalling ${pkg.name} ...
|
||||||
%~dp0${pkg.name}.exe uninstall
|
"%~dp0$"{pkg.name}.exe uninstall
|
||||||
|
|
||||||
@ECHO DONE.
|
@ECHO DONE.
|
||||||
@ -3,82 +3,26 @@
|
|||||||
setlocal ENABLEEXTENSIONS
|
setlocal ENABLEEXTENSIONS
|
||||||
|
|
||||||
@ECHO Detecting Java version installed.
|
@ECHO Detecting Java version installed.
|
||||||
:CHECK_JAVA_64
|
:CHECK_JAVA
|
||||||
@ECHO Detecting if it is 64 bit machine
|
for /f tokens^=2-5^ delims^=.-_^" %%j in ('java -fullversion 2^>^&1') do set "jver=%%j%%k"
|
||||||
set KEY_NAME="HKEY_LOCAL_MACHINE\Software\Wow6432Node\JavaSoft\Java Runtime Environment"
|
@ECHO CurrentVersion %jver%
|
||||||
set VALUE_NAME=CurrentVersion
|
|
||||||
|
|
||||||
FOR /F "usebackq skip=2 tokens=1-3" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO (
|
if %jver% NEQ 18 GOTO JAVA_NOT_INSTALLED
|
||||||
set ValueName=%%A
|
|
||||||
set ValueType=%%B
|
|
||||||
set ValueValue=%%C
|
|
||||||
)
|
|
||||||
@ECHO CurrentVersion %ValueValue%
|
|
||||||
|
|
||||||
SET KEY_NAME="%KEY_NAME:~1,-1%\%ValueValue%"
|
|
||||||
SET VALUE_NAME=JavaHome
|
|
||||||
|
|
||||||
if defined ValueName (
|
|
||||||
FOR /F "usebackq skip=2 tokens=1,2*" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO (
|
|
||||||
set ValueName2=%%A
|
|
||||||
set ValueType2=%%B
|
|
||||||
set JRE_PATH2=%%C
|
|
||||||
|
|
||||||
if defined ValueName2 (
|
|
||||||
set ValueName = %ValueName2%
|
|
||||||
set ValueType = %ValueType2%
|
|
||||||
set ValueValue = %JRE_PATH2%
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
IF NOT "%JRE_PATH2%" == "" GOTO JAVA_INSTALLED
|
|
||||||
|
|
||||||
:CHECK_JAVA_32
|
|
||||||
@ECHO Detecting if it is 32 bit machine
|
|
||||||
set KEY_NAME="HKEY_LOCAL_MACHINE\Software\JavaSoft\Java Runtime Environment"
|
|
||||||
set VALUE_NAME=CurrentVersion
|
|
||||||
|
|
||||||
FOR /F "usebackq skip=2 tokens=1-3" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO (
|
|
||||||
set ValueName=%%A
|
|
||||||
set ValueType=%%B
|
|
||||||
set ValueValue=%%C
|
|
||||||
)
|
|
||||||
@ECHO CurrentVersion %ValueValue%
|
|
||||||
|
|
||||||
SET KEY_NAME="%KEY_NAME:~1,-1%\%ValueValue%"
|
|
||||||
SET VALUE_NAME=JavaHome
|
|
||||||
|
|
||||||
if defined ValueName (
|
|
||||||
FOR /F "usebackq skip=2 tokens=1,2*" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO (
|
|
||||||
set ValueName2=%%A
|
|
||||||
set ValueType2=%%B
|
|
||||||
set JRE_PATH2=%%C
|
|
||||||
|
|
||||||
if defined ValueName2 (
|
|
||||||
set ValueName = %ValueName2%
|
|
||||||
set ValueType = %ValueType2%
|
|
||||||
set ValueValue = %JRE_PATH2%
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
IF "%JRE_PATH2%" == "" GOTO JAVA_NOT_INSTALLED
|
|
||||||
|
|
||||||
:JAVA_INSTALLED
|
:JAVA_INSTALLED
|
||||||
|
|
||||||
@ECHO Java 1.8 found!
|
@ECHO Java 1.8 found!
|
||||||
@ECHO Installing ${pkg.name} ...
|
@ECHO Installing ${pkg.name} ...
|
||||||
|
|
||||||
%BASE%${pkg.name}.exe install
|
"%BASE%$"{pkg.name}.exe install
|
||||||
|
|
||||||
@ECHO ${pkg.name} installed successfully!
|
@ECHO ${pkg.name} installed successfully!
|
||||||
|
|
||||||
GOTO END
|
GOTO END
|
||||||
|
|
||||||
:JAVA_NOT_INSTALLED
|
:JAVA_NOT_INSTALLED
|
||||||
@ECHO Java 1.8 or above is not installed
|
@ECHO Java 1.8 is not installed. Only Java 1.8 is supported
|
||||||
@ECHO Please go to https://java.com/ and install Java. Then retry installation.
|
@ECHO Please go to https://adoptopenjdk.net/index.html and install Java 1.8. Then retry installation.
|
||||||
PAUSE
|
PAUSE
|
||||||
GOTO END
|
GOTO END
|
||||||
|
|
||||||
|
|||||||
@ -4,6 +4,6 @@
|
|||||||
net stop ${pkg.name}
|
net stop ${pkg.name}
|
||||||
|
|
||||||
@ECHO Uninstalling ${pkg.name} ...
|
@ECHO Uninstalling ${pkg.name} ...
|
||||||
%~dp0${pkg.name}.exe uninstall
|
"%~dp0$"{pkg.name}.exe uninstall
|
||||||
|
|
||||||
@ECHO DONE.
|
@ECHO DONE.
|
||||||
@ -3,82 +3,26 @@
|
|||||||
setlocal ENABLEEXTENSIONS
|
setlocal ENABLEEXTENSIONS
|
||||||
|
|
||||||
@ECHO Detecting Java version installed.
|
@ECHO Detecting Java version installed.
|
||||||
:CHECK_JAVA_64
|
:CHECK_JAVA
|
||||||
@ECHO Detecting if it is 64 bit machine
|
for /f tokens^=2-5^ delims^=.-_^" %%j in ('java -fullversion 2^>^&1') do set "jver=%%j%%k"
|
||||||
set KEY_NAME="HKEY_LOCAL_MACHINE\Software\Wow6432Node\JavaSoft\Java Runtime Environment"
|
@ECHO CurrentVersion %jver%
|
||||||
set VALUE_NAME=CurrentVersion
|
|
||||||
|
|
||||||
FOR /F "usebackq skip=2 tokens=1-3" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO (
|
if %jver% NEQ 18 GOTO JAVA_NOT_INSTALLED
|
||||||
set ValueName=%%A
|
|
||||||
set ValueType=%%B
|
|
||||||
set ValueValue=%%C
|
|
||||||
)
|
|
||||||
@ECHO CurrentVersion %ValueValue%
|
|
||||||
|
|
||||||
SET KEY_NAME="%KEY_NAME:~1,-1%\%ValueValue%"
|
|
||||||
SET VALUE_NAME=JavaHome
|
|
||||||
|
|
||||||
if defined ValueName (
|
|
||||||
FOR /F "usebackq skip=2 tokens=1,2*" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO (
|
|
||||||
set ValueName2=%%A
|
|
||||||
set ValueType2=%%B
|
|
||||||
set JRE_PATH2=%%C
|
|
||||||
|
|
||||||
if defined ValueName2 (
|
|
||||||
set ValueName = %ValueName2%
|
|
||||||
set ValueType = %ValueType2%
|
|
||||||
set ValueValue = %JRE_PATH2%
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
IF NOT "%JRE_PATH2%" == "" GOTO JAVA_INSTALLED
|
|
||||||
|
|
||||||
:CHECK_JAVA_32
|
|
||||||
@ECHO Detecting if it is 32 bit machine
|
|
||||||
set KEY_NAME="HKEY_LOCAL_MACHINE\Software\JavaSoft\Java Runtime Environment"
|
|
||||||
set VALUE_NAME=CurrentVersion
|
|
||||||
|
|
||||||
FOR /F "usebackq skip=2 tokens=1-3" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO (
|
|
||||||
set ValueName=%%A
|
|
||||||
set ValueType=%%B
|
|
||||||
set ValueValue=%%C
|
|
||||||
)
|
|
||||||
@ECHO CurrentVersion %ValueValue%
|
|
||||||
|
|
||||||
SET KEY_NAME="%KEY_NAME:~1,-1%\%ValueValue%"
|
|
||||||
SET VALUE_NAME=JavaHome
|
|
||||||
|
|
||||||
if defined ValueName (
|
|
||||||
FOR /F "usebackq skip=2 tokens=1,2*" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO (
|
|
||||||
set ValueName2=%%A
|
|
||||||
set ValueType2=%%B
|
|
||||||
set JRE_PATH2=%%C
|
|
||||||
|
|
||||||
if defined ValueName2 (
|
|
||||||
set ValueName = %ValueName2%
|
|
||||||
set ValueType = %ValueType2%
|
|
||||||
set ValueValue = %JRE_PATH2%
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
IF "%JRE_PATH2%" == "" GOTO JAVA_NOT_INSTALLED
|
|
||||||
|
|
||||||
:JAVA_INSTALLED
|
:JAVA_INSTALLED
|
||||||
|
|
||||||
@ECHO Java 1.8 found!
|
@ECHO Java 1.8 found!
|
||||||
@ECHO Installing ${pkg.name} ...
|
@ECHO Installing ${pkg.name} ...
|
||||||
|
|
||||||
%BASE%${pkg.name}.exe install
|
"%BASE%$"{pkg.name}.exe install
|
||||||
|
|
||||||
@ECHO ${pkg.name} installed successfully!
|
@ECHO ${pkg.name} installed successfully!
|
||||||
|
|
||||||
GOTO END
|
GOTO END
|
||||||
|
|
||||||
:JAVA_NOT_INSTALLED
|
:JAVA_NOT_INSTALLED
|
||||||
@ECHO Java 1.8 or above is not installed
|
@ECHO Java 1.8 is not installed. Only Java 1.8 is supported
|
||||||
@ECHO Please go to https://java.com/ and install Java. Then retry installation.
|
@ECHO Please go to https://adoptopenjdk.net/index.html and install Java 1.8. Then retry installation.
|
||||||
PAUSE
|
PAUSE
|
||||||
GOTO END
|
GOTO END
|
||||||
|
|
||||||
|
|||||||
@ -4,6 +4,6 @@
|
|||||||
net stop ${pkg.name}
|
net stop ${pkg.name}
|
||||||
|
|
||||||
@ECHO Uninstalling ${pkg.name} ...
|
@ECHO Uninstalling ${pkg.name} ...
|
||||||
%~dp0${pkg.name}.exe uninstall
|
"%~dp0$"{pkg.name}.exe uninstall
|
||||||
|
|
||||||
@ECHO DONE.
|
@ECHO DONE.
|
||||||
Loading…
x
Reference in New Issue
Block a user