View | Details | Raw Unified | Return to bug 61590
Collapse All | Expand All

(-)bin/service.bat (-4 / +9 lines)
Lines 55-65 Link Here
55
if not exist "%JRE_HOME%\bin\javaw.exe" goto noJavaHome
55
if not exist "%JRE_HOME%\bin\javaw.exe" goto noJavaHome
56
goto okJavaHome
56
goto okJavaHome
57
:gotJdkHome
57
:gotJdkHome
58
if not exist "%JAVA_HOME%\jre\bin\java.exe" goto noJavaHome
58
if "%JRE_HOME%" == "" (
59
if not exist "%JAVA_HOME%\jre\bin\javaw.exe" goto noJavaHome
59
	if exist "%JAVA_HOME%\jre\bin\java.exe" (
60
		set "JRE_HOME=%JAVA_HOME%\jre"
61
	) else (
62
		set "JRE_HOME=%JAVA_HOME%"
63
	)
64
)
65
if not exist "%JRE_HOME%\bin\java.exe" goto noJavaHome
66
if not exist "%JRE_HOME%\bin\javaw.exe" goto noJavaHome
60
if not exist "%JAVA_HOME%\bin\javac.exe" goto noJavaHome
67
if not exist "%JAVA_HOME%\bin\javac.exe" goto noJavaHome
61
if not "%JRE_HOME%" == "" goto okJavaHome
62
set "JRE_HOME=%JAVA_HOME%\jre"
63
goto okJavaHome
68
goto okJavaHome
64
:noJavaHome
69
:noJavaHome
65
echo The JAVA_HOME environment variable is not defined correctly
70
echo The JAVA_HOME environment variable is not defined correctly

Return to bug 61590