From b9e59589a9d91c6cb520c70e5d51bddccbc3431b Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Thu, 09 Feb 2012 15:18:38 +0000
Subject: [PATCH] Fix for OPENDJ-132: upgrade utility does not accept relative path. Contribution from German Parente (thanks)

---
 opends/resource/bin/make-ldif.bat |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/opends/resource/bin/make-ldif.bat b/opends/resource/bin/make-ldif.bat
index e72bc81..9e70fea 100644
--- a/opends/resource/bin/make-ldif.bat
+++ b/opends/resource/bin/make-ldif.bat
@@ -24,28 +24,24 @@
 rem
 rem
 rem      Copyright 2006-2009 Sun Microsystems, Inc.
-rem      Portions Copyright 2011 ForgeRock AS
+rem      Portions Copyright 2011-2012 ForgeRock AS
 
 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 /d %DIR_HOME%\..
-set INSTALL_ROOT=%CD%
-cd /d %CUR_DIR%
+for %%i in (%~sf0) do set DIR_HOME=%%~dPsi..
+set INSTALL_ROOT=%DIR_HOME%
 
 set INSTANCE_DIR=
 for /f "delims=" %%a in (%INSTALL_ROOT%\instance.loc) do (
   set INSTANCE_DIR=%%a
 )
-set CUR_DIR=%~dp0
+
+set CUR_DIR=%CD%
 cd /d %INSTALL_ROOT%
 cd /d %INSTANCE_DIR%
 set INSTANCE_ROOT=%CD%

--
Gitblit v1.10.0