From 23dae5f81d0349d492a2e808f3ca8a8c82bcb6e1 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Thu, 07 Feb 2013 12:09:26 +0000
Subject: [PATCH] Fix issue OPENDJ-732: Both start-ds and set-java-home were missing quotes around variables, and failed if the Java path contains spaces (like with QuickSetup on Mac OSX, which uses the Plugin JRE).
---
opends/resource/bin/start-ds | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opends/resource/bin/start-ds b/opends/resource/bin/start-ds
index 743d081..e951cd2 100755
--- a/opends/resource/bin/start-ds
+++ b/opends/resource/bin/start-ds
@@ -24,7 +24,7 @@
#
#
# Copyright 2006-2009 Sun Microsystems, Inc.
-# Portions Copyright 2011 ForgeRock AS
+# Portions Copyright 2011-2013 ForgeRock AS
# Capture the current working directory so that we can change to it later.
@@ -92,7 +92,7 @@
# means that the server is already running and we shouldn't try to start it.
# An exit code of anything else means that we're not trying to start the server
# and we can just exit with that exit code.
-${OPENDJ_JAVA_BIN} -client ${SCRIPT_NAME_ARG} org.opends.server.core.DirectoryServer \
+"${OPENDJ_JAVA_BIN}" -client ${SCRIPT_NAME_ARG} org.opends.server.core.DirectoryServer \
--configClass org.opends.server.extensions.ConfigFileHandler \
--configFile "${CONFIG_FILE}" --checkStartability "${@}"
EC=${?}
@@ -119,7 +119,7 @@
if test ${EC} -eq 0
then
# An exit code of 98 means that the server is already running.
- ${OPENDJ_JAVA_BIN} -client ${SCRIPT_NAME_ARG} org.opends.server.core.DirectoryServer \
+ "${OPENDJ_JAVA_BIN}" -client ${SCRIPT_NAME_ARG} org.opends.server.core.DirectoryServer \
--configClass org.opends.server.extensions.ConfigFileHandler \
--configFile "${CONFIG_FILE}" --checkStartability > /dev/null 2>&1
EC=${?}
--
Gitblit v1.10.0