From c40f084a6d3e897785f2fbff3ddb97545644cddc Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 11 Dec 2006 15:34:39 +0000
Subject: [PATCH] The following modifications include the comments from Neil and Brian (thanks to both for your help):
---
opends/resource/setup | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/opends/resource/setup b/opends/resource/setup
index cfc8f56..bb4e26a 100755
--- a/opends/resource/setup
+++ b/opends/resource/setup
@@ -32,16 +32,23 @@
then
if test -z "${JAVA_HOME}"
then
- JAVA_BIN=`which java 2> /dev/null`
- if test ${?} -eq 0
+ if test -f "${INSTANCE_ROOT}/bin/set-java-home"
then
+ . "${INSTANCE_ROOT}/bin/set-java-home"
+ JAVA_BIN="${JAVA_HOME}/bin/java"
export JAVA_BIN
else
- echo "Please set JAVA_HOME to the root of a Java 5.0 installation."
- exit 1
+ JAVA_BIN=`which java 2> /dev/null`
+ if test ${?} -eq 0
+ then
+ export JAVA_BIN
+ else
+ echo "Please set JAVA_HOME to the root of a Java 5.0 installation."
+ exit 1
+ fi
fi
else
- JAVA_BIN=${JAVA_HOME}/bin/java
+ JAVA_BIN="${JAVA_HOME}/bin/java"
export JAVA_BIN
fi
fi
@@ -111,5 +118,5 @@
# Launch the setup process.
-"${JAVA_BIN}" org.opends.quicksetup.SetupLauncher -P setup "${@}"
+"${JAVA_BIN}" org.opends.quicksetup.installer.InstallLauncher -P setup "${@}"
--
Gitblit v1.10.0