From 7b5bd8934136e16332dc622889cdf5763b417f00 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Fri, 19 Sep 2008 13:49:05 +0000
Subject: [PATCH] adapt make-ldif tool for split between instance and install
---
opends/resource/bin/make-ldif | 22 +++++++++++++++++++++-
opends/resource/bin/make-ldif.bat | 25 ++++++++++++++++++++++++-
2 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/opends/resource/bin/make-ldif b/opends/resource/bin/make-ldif
index a281ef0..cca6e47 100755
--- a/opends/resource/bin/make-ldif
+++ b/opends/resource/bin/make-ldif
@@ -33,6 +33,26 @@
SCRIPT_NAME="make-ldif"
export SCRIPT_NAME
+WORKING_DIR=`pwd`
+
+cd "`dirname "${0}"`"
+SCRIPT_DIR=`pwd`
+
+cd ..
+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}"`
"${SCRIPT_DIR}/../lib/_server-script.sh" \
- --resourcePath "${SCRIPT_DIR}/../config/MakeLDIF" "${@}"
+ --resourcePath "${INSTANCE_ROOT}/config/MakeLDIF" "${@}"
diff --git a/opends/resource/bin/make-ldif.bat b/opends/resource/bin/make-ldif.bat
index 7dcbc4a..a0298f3 100644
--- a/opends/resource/bin/make-ldif.bat
+++ b/opends/resource/bin/make-ldif.bat
@@ -27,7 +27,30 @@
setlocal
+for %%i in (%~sf0) do set NON_ESCAPED=%%~dPsi..
+
+
+FOR /F "tokens=1-2* delims=%%" %%1 IN ("%NON_ESCAPED%") DO (
+if NOT "%%2" == "" goto invalidPath)
+
+for %%i in (%~sf0) do set DIR_HOME=%%~dPsi.
+
+set CUR_DIR=%~dp0
+cd %DIR_HOME%\..
+set INSTALL_ROOT=%CD%
+cd %CUR_DIR%
+
+set INSTANCE_DIR=
+for /f "delims=" %%a in (%INSTALL_ROOT%\instance.loc) do (
+ set INSTANCE_DIR=%%a
+)
+set CUR_DIR=%~dp0
+cd %INSTALL_ROOT%
+cd %INSTANCE_DIR%
+set INSTANCE_ROOT=%CD%
+cd %CUR_DIR%
+
set OPENDS_INVOKE_CLASS="org.opends.server.tools.makeldif.MakeLDIF"
set SCRIPT_NAME=make-ldif
-for %%i in (%~sf0) do call "%%~dPsi\..\lib\_server-script.bat" --resourcePath "%%~dPsi..\config\MakeLDIF" %*
+"%INSTALL_ROOT%\lib\_server-script.bat" --resourcePath "%INSTANCE_ROOT%\config\MakeLDIF" %*
--
Gitblit v1.10.0