From e3481dab82e6849b68bf54205f121e18a647d142 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 21 Dec 2007 20:09:34 +0000
Subject: [PATCH] The following one-line commit avoid problems in the case the user modifies set-java-home (or we keep an old set-java-home). If calling set-java-hme does not set OPENDS_JAVA_BIN, just try to figure it out from the environment (instead of assuming that set-java-home will do that *always*).
---
opends/resource/bin/_script-util.sh | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/opends/resource/bin/_script-util.sh b/opends/resource/bin/_script-util.sh
index dc001c0..394afcb 100644
--- a/opends/resource/bin/_script-util.sh
+++ b/opends/resource/bin/_script-util.sh
@@ -32,7 +32,8 @@
if test -f "${INSTANCE_ROOT}/lib/set-java-home"
then
. "${INSTANCE_ROOT}/lib/set-java-home"
- elif test -z "${OPENDS_JAVA_BIN}"
+ fi
+ if test -z "${OPENDS_JAVA_BIN}"
then
if test -z "${OPENDS_JAVA_HOME}"
then
--
Gitblit v1.10.0