From 2696af0025239e49bde105cb3d1d4f596e16e33c Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Thu, 26 Apr 2007 22:09:33 +0000
Subject: [PATCH] Restore changes that appear to have been accidentally reverted by the previous commit.
---
opendj-sdk/opends/resource/upgrade | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-sdk/opends/resource/upgrade b/opendj-sdk/opends/resource/upgrade
index 7950ae4..9db6ea2 100644
--- a/opendj-sdk/opends/resource/upgrade
+++ b/opendj-sdk/opends/resource/upgrade
@@ -32,9 +32,9 @@
then
if test -z "${JAVA_HOME}"
then
- if test -f "${INSTANCE_ROOT}/bin/set-java-home"
+ if test -f "${INSTANCE_ROOT}/lib/set-java-home"
then
- . "${INSTANCE_ROOT}/bin/set-java-home"
+ . "${INSTANCE_ROOT}/lib/set-java-home"
JAVA_BIN="${JAVA_HOME}/bin/java"
JAVAWS_BIN="${JAVA_HOME}/bin/javaws"
export JAVA_BIN
@@ -47,7 +47,7 @@
export JAVA_BIN
export JAVAWS_BIN
else
- echo "Please set JAVA_HOME to the root of a Java 5.0 installation."
+ echo "Please set JAVA_HOME to the root of a Java 5 (or later) installation."
exit 1
fi
fi
@@ -111,7 +111,7 @@
if test ${?} -ne 0
then
echo "ERROR: The detected Java version could not be used. Please set "
- echo " JAVA_HOME to the root of a Java 5.0 installation."
+ echo " JAVA_HOME to the root of a Java 5 (or later) installation."
exit 1
fi
fi
--
Gitblit v1.10.0