From 1e3fa6ba72744468cd808c752edd00bb843e1773 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Fri, 22 Jun 2007 02:07:30 +0000
Subject: [PATCH] Update the start-ds script so that it uses "Java.5.0 or higher" instead of just "Java 5.0". Also, if JAVA_ARGS is given and there's a chance the arguments are invalid, then include a message indicating that the user should check them.
---
opendj-sdk/opends/resource/bin/start-ds | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/opendj-sdk/opends/resource/bin/start-ds b/opendj-sdk/opends/resource/bin/start-ds
index 2d000f5..a2f69a7 100755
--- a/opendj-sdk/opends/resource/bin/start-ds
+++ b/opendj-sdk/opends/resource/bin/start-ds
@@ -58,7 +58,9 @@
then
export JAVA_BIN
else
- echo "Please set JAVA_HOME to the root of a Java 5.0 installation."
+ echo "ERROR: No Java installation could be found. Please set"
+ echo " JAVA_HOME to the root of a Java 5.0 or higher"
+ echo " installation."
exit 1
fi
fi
@@ -109,16 +111,20 @@
"${JAVA_BIN}" org.opends.server.tools.InstallDS -t 2> /dev/null
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 "ERROR: The detected Java version could not be used. Please ensure"
+ echo " that JAVA_HOME is set to the root of a valid Java 5.0 or"
+ echo " higher installation."
exit 1
fi
else
"${JAVA_BIN}" ${JAVA_ARGS} org.opends.server.tools.InstallDS -t 2> /dev/null
if test ${?} -ne 0
then
- echo "ERROR: The detected Java version could not be used with the specified"
- echo "Java arguments. Please set JAVA_HOME to the root of a Java 5.0 installation."
+ echo "ERROR: The detected Java version could not be used with the"
+ echo " set of arguments. Please ensure that JAVA_HOME is set to"
+ echo " the root of a valid Java 5.0 or higher installation, and"
+ echo " make sure that JAVA_ARGS contains a valid set of arguments"
+ echo " for that JVM."
exit 1
fi
fi
--
Gitblit v1.10.0