From d42b15e420478dc45785fff6e00b863cc1f8a0f9 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Thu, 18 Sep 2008 10:14:53 +0000
Subject: [PATCH] These changes are separating the current delivery into an "Install Layout" (the binaries) and an "Instance Layout" (the user data).
---
opends/resource/bin/stop-ds | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/opends/resource/bin/stop-ds b/opends/resource/bin/stop-ds
index f432632..71e46a2 100755
--- a/opends/resource/bin/stop-ds
+++ b/opends/resource/bin/stop-ds
@@ -44,8 +44,17 @@
SCRIPT_DIR=`pwd`
cd ..
-INSTANCE_ROOT=`pwd`
-export INSTANCE_ROOT
+INSTALL_ROOT=`pwd`
+export INSTALL_ROOT
+
+if cat ${INSTALL_ROOT}/instance.loc | grep '^/' > /dev/null
+then
+ INSTANCE_ROOT=`cat ${INSTALL_ROOT}/instance.loc`
+ export INSTANCE_ROOT
+else
+ INSTANCE_ROOT=${INSTALL_ROOT}/`cat ${INSTALL_ROOT}/instance.loc`
+ export INSTANCE_ROOT
+fi
cd "${WORKING_DIR}"
@@ -62,7 +71,7 @@
# Set environment variables
SCRIPT_UTIL_CMD=set-full-environment-and-test-java
export SCRIPT_UTIL_CMD
-. "${INSTANCE_ROOT}/lib/_script-util.sh"
+. "${INSTALL_ROOT}/lib/_script-util.sh"
RETURN_CODE=$?
if test ${RETURN_CODE} -ne 0
then
@@ -175,11 +184,11 @@
OPENDS_JAVA_BIN=${ORIGINAL_JAVA_BIN}
if test ${QUIET_MODE} -eq 0
then
- "${INSTANCE_ROOT}/bin/start-ds" --quiet
+ "${INSTALL_ROOT}/bin/start-ds" --quiet
EXIT_CODE=${?}
exit ${EXIT_CODE}
else
- "${INSTANCE_ROOT}/bin/start-ds"
+ "${INSTALL_ROOT}/bin/start-ds"
EXIT_CODE=${?}
exit ${EXIT_CODE}
fi
--
Gitblit v1.10.0