From 890b07e6b33f006958c25c240639c4e072aa2b49 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Mon, 12 Aug 2013 15:40:53 +0000
Subject: [PATCH] Fix windows batch if instance.loc is missing - OPENDJ-1069

---
 opends/resource/bin/stop-ds.bat        |    6 ++-
 opends/resource/bin/_server-script.bat |    6 ++-
 opends/resource/uninstall.bat          |    6 ++-
 opends/resource/bin/_mixed-script.bat  |    6 ++-
 opends/resource/bin/_script-util.bat   |    6 ++-
 opends/resource/bin/control-panel.bat  |    6 ++-
 opends/resource/bin/make-ldif.bat      |    7 ++-
 opends/resource/bin/_client-script.bat |    7 ++-
 opends/resource/bin/start-ds.bat       |    6 ++-
 opends/resource/setup.bat              |    6 ++-
 10 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/opends/resource/bin/_client-script.bat b/opends/resource/bin/_client-script.bat
index 00505cd..40e3d13 100644
--- a/opends/resource/bin/_client-script.bat
+++ b/opends/resource/bin/_client-script.bat
@@ -34,9 +34,12 @@
 set INSTALL_ROOT=%DIR_HOME%
 
 set INSTANCE_DIR=
-for /f "delims=" %%a in (%INSTALL_ROOT%\instance.loc) do (
-  set INSTANCE_DIR=%%a
+if exist "%INSTALL_ROOT%\instance.loc" (
+  set /p INSTANCE_DIR=<%INSTALL_ROOT%\instance.loc
+) else (
+set INSTANCE_DIR=.
 )
+
 set CUR_DIR=%CD%
 cd /d %INSTALL_ROOT%
 cd /d %INSTANCE_DIR%
diff --git a/opends/resource/bin/_mixed-script.bat b/opends/resource/bin/_mixed-script.bat
index 5ca00af..78c597e 100644
--- a/opends/resource/bin/_mixed-script.bat
+++ b/opends/resource/bin/_mixed-script.bat
@@ -34,8 +34,10 @@
 set INSTALL_ROOT=%DIR_HOME%
 
 set INSTANCE_DIR=
-for /f "delims=" %%a in (%INSTALL_ROOT%\instance.loc) do (
-  set INSTANCE_DIR=%%a
+if exist "%INSTALL_ROOT%\instance.loc" (
+  set /p INSTANCE_DIR=<%INSTALL_ROOT%\instance.loc
+) else (
+set INSTANCE_DIR=.
 )
 set CUR_DIR=%CD%
 cd /d %INSTALL_ROOT%
diff --git a/opends/resource/bin/_script-util.bat b/opends/resource/bin/_script-util.bat
index 50de217..930c1b5 100644
--- a/opends/resource/bin/_script-util.bat
+++ b/opends/resource/bin/_script-util.bat
@@ -45,8 +45,10 @@
 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
+if exist "%INSTALL_ROOT%\instance.loc" (
+  set /p INSTANCE_DIR=<%INSTALL_ROOT%\instance.loc
+) else (
+set INSTANCE_DIR=.
 )
 set CUR_DIR=%CD%
 cd /d %INSTALL_ROOT%
diff --git a/opends/resource/bin/_server-script.bat b/opends/resource/bin/_server-script.bat
index 6805cc8..4e4a741 100644
--- a/opends/resource/bin/_server-script.bat
+++ b/opends/resource/bin/_server-script.bat
@@ -34,8 +34,10 @@
 set INSTALL_ROOT=%DIR_HOME%
 
 set INSTANCE_DIR=
-for /f "delims=" %%a in (%INSTALL_ROOT%\instance.loc) do (
-  set INSTANCE_DIR=%%a
+if exist "%INSTALL_ROOT%\instance.loc" (
+  set /p INSTANCE_DIR=<%INSTALL_ROOT%\instance.loc
+) else (
+set INSTANCE_DIR=.
 )
 set CUR_DIR=%CD%
 cd %INSTALL_ROOT%
diff --git a/opends/resource/bin/control-panel.bat b/opends/resource/bin/control-panel.bat
index 4606310..05ce377 100644
--- a/opends/resource/bin/control-panel.bat
+++ b/opends/resource/bin/control-panel.bat
@@ -31,8 +31,10 @@
 set INSTALL_ROOT=%DIR_HOME%
 
 set INSTANCE_DIR=
-for /f "delims=" %%a in (%DIR_HOME%\instance.loc) do (
-  set INSTANCE_DIR=%%a
+if exist "%INSTALL_ROOT%\instance.loc" (
+  set /p INSTANCE_DIR=<%INSTALL_ROOT%\instance.loc
+) else (
+set INSTANCE_DIR=.
 )
 set CUR_DIR=%CD%
 cd /d %INSTALL_ROOT%
diff --git a/opends/resource/bin/make-ldif.bat b/opends/resource/bin/make-ldif.bat
index 9e70fea..a474f86 100644
--- a/opends/resource/bin/make-ldif.bat
+++ b/opends/resource/bin/make-ldif.bat
@@ -37,10 +37,11 @@
 set INSTALL_ROOT=%DIR_HOME%
 
 set INSTANCE_DIR=
-for /f "delims=" %%a in (%INSTALL_ROOT%\instance.loc) do (
-  set INSTANCE_DIR=%%a
+if exist "%INSTALL_ROOT%\instance.loc" (
+  set /p INSTANCE_DIR=<%INSTALL_ROOT%\instance.loc
+) else (
+set INSTANCE_DIR=.
 )
-
 set CUR_DIR=%CD%
 cd /d %INSTALL_ROOT%
 cd /d %INSTANCE_DIR%
diff --git a/opends/resource/bin/start-ds.bat b/opends/resource/bin/start-ds.bat
index 615443e..922b6cb 100644
--- a/opends/resource/bin/start-ds.bat
+++ b/opends/resource/bin/start-ds.bat
@@ -31,8 +31,10 @@
 set INSTALL_ROOT=%DIR_HOME%
 
 set INSTANCE_DIR=
-for /f "delims=" %%a in (%DIR_HOME%\instance.loc) do (
-  set INSTANCE_DIR=%%a
+if exist "%INSTALL_ROOT%\instance.loc" (
+  set /p INSTANCE_DIR=<%INSTALL_ROOT%\instance.loc
+) else (
+set INSTANCE_DIR=.
 )
 set CUR_DIR=%CD%
 cd /d %INSTALL_ROOT%
diff --git a/opends/resource/bin/stop-ds.bat b/opends/resource/bin/stop-ds.bat
index 05efad8..6a7caf0 100644
--- a/opends/resource/bin/stop-ds.bat
+++ b/opends/resource/bin/stop-ds.bat
@@ -42,8 +42,10 @@
 set INSTALL_ROOT=%DIR_HOME%
 
 set INSTANCE_DIR=
-for /f "delims=" %%a in (%INSTALL_ROOT%\instance.loc) do (
-  set INSTANCE_DIR=%%a
+if exist "%INSTALL_ROOT%\instance.loc" (
+  set /p INSTANCE_DIR=<%INSTALL_ROOT%\instance.loc
+) else (
+set INSTANCE_DIR=.
 )
 set CUR_DIR=%CD%
 cd /d%INSTALL_ROOT%
diff --git a/opends/resource/setup.bat b/opends/resource/setup.bat
index 5338019..44b755c 100644
--- a/opends/resource/setup.bat
+++ b/opends/resource/setup.bat
@@ -40,8 +40,10 @@
 
 set INSTALL_ROOT=%DIR_HOME%
 set INSTANCE_DIR=
-for /f "delims=" %%a in (%INSTALL_ROOT%\instance.loc) do (
-  set INSTANCE_DIR=%%a
+if exist "%INSTALL_ROOT%\instance.loc" (
+  set /p INSTANCE_DIR=<%INSTALL_ROOT%\instance.loc
+) else (
+set INSTANCE_DIR=.
 )
 set CUR_DIR=%CD%
 cd /d %INSTALL_ROOT%
diff --git a/opends/resource/uninstall.bat b/opends/resource/uninstall.bat
index 9c4cda6..d15d94a 100644
--- a/opends/resource/uninstall.bat
+++ b/opends/resource/uninstall.bat
@@ -31,8 +31,10 @@
 
 set INSTALL_ROOT=%DIR_HOME%
 set INSTANCE_DIR=
-for /f "delims=" %%a in (%INSTALL_ROOT%\instance.loc) do (
-  set INSTANCE_DIR=%%a
+if exist "%INSTALL_ROOT%\instance.loc" (
+  set /p INSTANCE_DIR=<%INSTALL_ROOT%\instance.loc
+) else (
+set INSTANCE_DIR=.
 )
 set CUR_DIR=%CD%
 cd /d %INSTALL_ROOT%

--
Gitblit v1.10.0