From 43ba6d721185f9a810761720fcb05103b31d17b7 Mon Sep 17 00:00:00 2001
From: chebrard <chebrard@localhost>
Date: Wed, 29 Oct 2008 10:39:44 +0000
Subject: [PATCH] Fix 3534: Provide native Solaris packages (fix also 3533: upgrade fails starting server adding entry ds-cfg-key-id)
---
opends/resource/bin/make-ldif | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/opends/resource/bin/make-ldif b/opends/resource/bin/make-ldif
index cca6e47..38a2c0e 100755
--- a/opends/resource/bin/make-ldif
+++ b/opends/resource/bin/make-ldif
@@ -42,17 +42,15 @@
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}"
-SCRIPT_DIR=`dirname "${0}"`
+# Set environment variables
+. "${INSTALL_ROOT}/lib/_script-util.sh"
+RETURN_CODE=$?
+if test ${RETURN_CODE} -ne 0
+then
+ exit ${RETURN_CODE}
+fi
+
"${SCRIPT_DIR}/../lib/_server-script.sh" \
--resourcePath "${INSTANCE_ROOT}/config/MakeLDIF" "${@}"
--
Gitblit v1.10.0