From 3dfb061cbafd3a97c9359f739942924a8ee525f1 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.
---
opends/resource/setup | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/opends/resource/setup b/opends/resource/setup
index 731baf4..f7f78a5 100755
--- a/opends/resource/setup
+++ b/opends/resource/setup
@@ -24,6 +24,7 @@
#
#
# Copyright 2006-2008 Sun Microsystems, Inc.
+# Portions Copyright 2011 ForgeRock AS
# Capture the current working directory so that we can change to it later.
@@ -53,7 +54,7 @@
fi
# Launch the setup process.
-"${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 "${@}"
# return part
RETURN_CODE=$?
--
Gitblit v1.10.0