From c0493d41a642a6c66ee676cc93c5330468d25b56 Mon Sep 17 00:00:00 2001 From: Ludovic Poitou <ludovic.poitou@forgerock.com> Date: Wed, 02 Nov 2011 12:07:15 +0000 Subject: [PATCH] Fix for OPENDJ-222 : Renamed environment variables to OPENDJ_... Updated scripts so that if OPENDJ_JAVA_HOME and OPENDJ_JAVA_ARGS are not defined, we look at the legacy OPENDS_... ones. --- opendj-sdk/opends/resource/setup.bat | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opendj-sdk/opends/resource/setup.bat b/opendj-sdk/opends/resource/setup.bat index 304d807..30a5c1c 100644 --- a/opendj-sdk/opends/resource/setup.bat +++ b/opendj-sdk/opends/resource/setup.bat @@ -66,11 +66,11 @@ goto end :callLaunch -"%INSTALL_ROOT%\lib\winlauncher.exe" launch "%OPENDS_JAVA_BIN%" %OPENDS_JAVA_ARGS% %SCRIPT_NAME_ARG% org.opends.quicksetup.installer.SetupLauncher +"%INSTALL_ROOT%\lib\winlauncher.exe" launch "%OPENDJ_JAVA_BIN%" %OPENDJ_JAVA_ARGS% %SCRIPT_NAME_ARG% org.opends.quicksetup.installer.SetupLauncher goto end :callJava -"%OPENDS_JAVA_BIN%" %OPENDS_JAVA_ARGS% %SCRIPT_NAME_ARG% org.opends.quicksetup.installer.SetupLauncher %* +"%OPENDJ_JAVA_BIN%" %OPENDJ_JAVA_ARGS% %SCRIPT_NAME_ARG% org.opends.quicksetup.installer.SetupLauncher %* rem return part if %errorlevel% == 50 goto version -- Gitblit v1.10.0