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/uninstall | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/opends/resource/uninstall b/opends/resource/uninstall
index e50905d..f1e6ad5 100644
--- a/opends/resource/uninstall
+++ b/opends/resource/uninstall
@@ -39,15 +39,24 @@
SCRIPT_NAME=uninstall
export SCRIPT_NAME
-INSTANCE_ROOT=${SCRIPT_DIR}
-export INSTANCE_ROOT
+INSTALL_ROOT=${SCRIPT_DIR}
+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}"
# 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
--
Gitblit v1.10.0