From 3c20e6f1f0da8755cf2d1dfa6758e85d3ac69ca5 Mon Sep 17 00:00:00 2001 From: Kyle Gottfried Date: Thu, 7 Apr 2016 11:21:57 -0400 Subject: [PATCH] support IBM_JDK --- src/main/scripts/graylog-collector-service.bat | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/scripts/graylog-collector-service.bat b/src/main/scripts/graylog-collector-service.bat index 9f8d8d1..ef3c834 100644 --- a/src/main/scripts/graylog-collector-service.bat +++ b/src/main/scripts/graylog-collector-service.bat @@ -33,7 +33,7 @@ SET SERVICE_NAME=%1 FOR %%D in ("%COLLECTOR_BIN_DIR%..") DO SET COLLECTOR_ROOT=%%~dpfD :: Detect if we are running on 32bit or 64bit Windows. -"%JAVA_HOME%\bin\java" -version 2>&1 | "%windir%\System32\find" "64-Bit" >nul: +"%JAVA_HOME%\bin\java.exe" -d32 -version 2>&1 | "%windir%\System32\find" "does not support" >nul: IF errorlevel 1 (SET ARCH=x86) ELSE (SET ARCH=x64) :: Use the correct executable based on the architecture. @@ -65,6 +65,8 @@ ECHO ARCH: "%ARCH%" ECHO. :: Select the correct JVM DLL. +SET JVM_DLL=%JAVA_HOME%\jre\bin\default\jvm.dll +IF EXIST "%JVM_DLL%" GOTO actionInstall SET JVM_DLL=%JAVA_HOME%\jre\bin\server\jvm.dll IF EXIST "%JVM_DLL%" GOTO actionInstall SET JVM_DLL=%JAVA_HOME%\bin\server\jvm.dll