honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

detect JRE (vs JDK) and invalid JAVA_HOME 

fixes #3739
This commit is contained in:
Costin Leau 2013-09-19 17:32:33 +03:00
parent 04deb80634
commit 9fe99aa6e9
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bin/service.bat
View File

@ -7,6 +7,10 @@ set SCRIPT_DIR=%~dp0
for %%I in ("%SCRIPT_DIR%..") do set ES_HOME=%%~dpfI
rem Detect JVM version to figure out appropriate executable to use
if not exist "%JAVA_HOME%\bin\java.exe" (
echo JAVA_HOME points to an invalid Java installation (no java.exe found in "%JAVA_HOME%"^). Existing...
goto finally
)
"%JAVA_HOME%\bin\java" -version 2>&1 | find "64-Bit" >nul:
if errorlevel 1 (
@ -92,11 +96,24 @@ echo The service '%SERVICE_ID%' has been removed
goto finally
:doInstall
echo Installing service : '%SERVICE_ID%'
echo Using JAVA_HOME (%ARCH%): %JAVA_HOME%
echo Installing service : "%SERVICE_ID%"
echo Using JAVA_HOME (%ARCH%): "%JAVA_HOME%"
rem Check JVM server dll first
set JVM_DLL=%JAVA_HOME%\jre\bin\server\jvm.dll
if exist %JVM_DLL% goto foundJVM
set JVM_DLL=%JAVA_HOME%\bin\client\jvm.dll
if exist %JVM_DLL% (
echo Warning: JAVA_HOME points to a JRE and not JDK installation; a client (not a server^) JVM will be used...
) else (
echo JAVA_HOME points to an invalid Java installation (no jvm.dll found in "%JAVA_HOME%"^). Existing...
goto finally
)
:foundJVM
if "%ES_MIN_MEM%" == "" (
set ES_MIN_MEM=256m
)