From bb4225dd73a5ee37561b8694dcfe49a32d09c804 Mon Sep 17 00:00:00 2001 From: lutoff <lutoff@localhost> Date: Fri, 26 Sep 2008 12:36:07 +0000 Subject: [PATCH] fix for issue #3498 - stop-ds.bat doesn't work anymore if not launched from server root (OpenDS1.1.0) windows 'cd' cmd should be used with the '/d' modifier --- opendj-sdk/opends/resource/setup.bat | 6 +- opendj-sdk/opends/resource/bin/make-ldif.bat | 10 ++-- opendj-sdk/opends/resource/bin/_script-util.bat | 6 +- opendj-sdk/opends/resource/bin/_client-script.bat | 6 +- opendj-sdk/opends/resource/bin/_mixed-script.bat | 6 +- opendj-sdk/opends/resource/uninstall.bat | 6 +- opendj-sdk/opends/resource/bin/stop-ds.bat | 6 +- opendj-sdk/opends/resource/bin/start-ds.bat | 6 +- opendj-sdk/opends/resource/bin/status-panel.bat | 6 +- opendj-sdk/opends/resource/upgrade.bat | 6 +- 10 files changed, 32 insertions(+), 32 deletions(-) diff --git a/opendj-sdk/opends/resource/bin/_client-script.bat b/opendj-sdk/opends/resource/bin/_client-script.bat index 40e17fd..65eafdb 100644 --- a/opendj-sdk/opends/resource/bin/_client-script.bat +++ b/opendj-sdk/opends/resource/bin/_client-script.bat @@ -37,10 +37,10 @@ set INSTANCE_DIR=%%a ) set CUR_DIR=%~dp0 -cd %INSTALL_ROOT% -cd %INSTANCE_DIR% +cd /d %INSTALL_ROOT% +cd /d %INSTANCE_DIR% set INSTANCE_ROOT=%CD% -cd %CUR_DIR% +cd /d %CUR_DIR% if "%OPENDS_INVOKE_CLASS%" == "" goto noInvokeClass goto launchCommand diff --git a/opendj-sdk/opends/resource/bin/_mixed-script.bat b/opendj-sdk/opends/resource/bin/_mixed-script.bat index 0edb52a..6fa1c0a 100644 --- a/opendj-sdk/opends/resource/bin/_mixed-script.bat +++ b/opendj-sdk/opends/resource/bin/_mixed-script.bat @@ -37,10 +37,10 @@ set INSTANCE_DIR=%%a ) set CUR_DIR=%~dp0 -cd %INSTALL_ROOT% -cd %INSTANCE_DIR% +cd /d %INSTALL_ROOT% +cd /d %INSTANCE_DIR% set INSTANCE_ROOT=%CD% -cd %CUR_DIR% +cd /d %CUR_DIR% if "%OPENDS_INVOKE_CLASS%" == "" goto noInvokeClass diff --git a/opendj-sdk/opends/resource/bin/_script-util.bat b/opendj-sdk/opends/resource/bin/_script-util.bat index a772b18..e4af259 100644 --- a/opendj-sdk/opends/resource/bin/_script-util.bat +++ b/opendj-sdk/opends/resource/bin/_script-util.bat @@ -48,10 +48,10 @@ set INSTANCE_DIR=%%a ) set CUR_DIR=%~dp0 -cd %INSTALL_ROOT% -cd %INSTANCE_DIR% +cd /d %INSTALL_ROOT% +cd /d %INSTANCE_DIR% set INSTANCE_ROOT=%CD% -cd %CUR_DIR% +cd /d %CUR_DIR% goto scriptBegin diff --git a/opendj-sdk/opends/resource/bin/make-ldif.bat b/opendj-sdk/opends/resource/bin/make-ldif.bat index a0298f3..a6586dd 100644 --- a/opendj-sdk/opends/resource/bin/make-ldif.bat +++ b/opendj-sdk/opends/resource/bin/make-ldif.bat @@ -36,19 +36,19 @@ for %%i in (%~sf0) do set DIR_HOME=%%~dPsi. set CUR_DIR=%~dp0 -cd %DIR_HOME%\.. +cd /d %DIR_HOME%\.. set INSTALL_ROOT=%CD% -cd %CUR_DIR% +cd /d %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% +cd /d %INSTALL_ROOT% +cd /d %INSTANCE_DIR% set INSTANCE_ROOT=%CD% -cd %CUR_DIR% +cd /d %CUR_DIR% set OPENDS_INVOKE_CLASS="org.opends.server.tools.makeldif.MakeLDIF" set SCRIPT_NAME=make-ldif diff --git a/opendj-sdk/opends/resource/bin/start-ds.bat b/opendj-sdk/opends/resource/bin/start-ds.bat index 39e7414..86284a2 100644 --- a/opendj-sdk/opends/resource/bin/start-ds.bat +++ b/opendj-sdk/opends/resource/bin/start-ds.bat @@ -34,10 +34,10 @@ set INSTANCE_DIR=%%a ) set CUR_DIR=%~dp0 -cd %INSTALL_ROOT% -cd %INSTANCE_DIR% +cd /d %INSTALL_ROOT% +cd /d %INSTANCE_DIR% set INSTANCE_ROOT=%CD% -cd %CUR_DIR% +cd /d %CUR_DIR% set LOG="%INSTANCE_ROOT%\logs\native-windows.out" set SCRIPT=start-ds.bat diff --git a/opendj-sdk/opends/resource/bin/status-panel.bat b/opendj-sdk/opends/resource/bin/status-panel.bat index 3e88ad8..25d1c88 100644 --- a/opendj-sdk/opends/resource/bin/status-panel.bat +++ b/opendj-sdk/opends/resource/bin/status-panel.bat @@ -34,10 +34,10 @@ set INSTANCE_DIR=%%a ) set CUR_DIR=%~dp0 -cd %INSTALL_ROOT% -cd %INSTANCE_DIR% +cd /d %INSTALL_ROOT% +cd /d %INSTANCE_DIR% set INSTANCE_ROOT=%CD% -cd %CUR_DIR% +cd /d %CUR_DIR% set SCRIPT_NAME=status-panel diff --git a/opendj-sdk/opends/resource/bin/stop-ds.bat b/opendj-sdk/opends/resource/bin/stop-ds.bat index 6cba248..e86f0c3 100644 --- a/opendj-sdk/opends/resource/bin/stop-ds.bat +++ b/opendj-sdk/opends/resource/bin/stop-ds.bat @@ -45,10 +45,10 @@ set INSTANCE_DIR=%%a ) set CUR_DIR=%~dp0 -cd %INSTALL_ROOT% -cd %INSTANCE_DIR% +cd /d%INSTALL_ROOT% +cd /d%INSTANCE_DIR% set INSTANCE_ROOT=%CD% -cd %CUR_DIR% +cd /d%CUR_DIR% set LOG="%INSTANCE_ROOT%\logs\native-windows.out" set SCRIPT=stop-ds.bat diff --git a/opendj-sdk/opends/resource/setup.bat b/opendj-sdk/opends/resource/setup.bat index 81b7f8d..834517a 100644 --- a/opendj-sdk/opends/resource/setup.bat +++ b/opendj-sdk/opends/resource/setup.bat @@ -43,10 +43,10 @@ set INSTANCE_DIR=%%a ) set CUR_DIR=%~dp0 -cd %INSTALL_ROOT% -cd %INSTANCE_DIR% +cd /d %INSTALL_ROOT% +cd /d %INSTANCE_DIR% set INSTANCE_ROOT=%CD% -cd %CUR_DIR% +cd /d %CUR_DIR% set SCRIPT_NAME=setup diff --git a/opendj-sdk/opends/resource/uninstall.bat b/opendj-sdk/opends/resource/uninstall.bat index 1e4a6ce..ae19628 100644 --- a/opendj-sdk/opends/resource/uninstall.bat +++ b/opendj-sdk/opends/resource/uninstall.bat @@ -34,10 +34,10 @@ set INSTANCE_DIR=%%a ) set CUR_DIR=%~dp0 -cd %INSTALL_ROOT% -cd %INSTANCE_DIR% +cd /d %INSTALL_ROOT% +cd /d %INSTANCE_DIR% set INSTANCE_ROOT=%CD% -cd %CUR_DIR% +cd /d %CUR_DIR% set SCRIPT_NAME=uninstall diff --git a/opendj-sdk/opends/resource/upgrade.bat b/opendj-sdk/opends/resource/upgrade.bat index 5a52041..26b3146 100644 --- a/opendj-sdk/opends/resource/upgrade.bat +++ b/opendj-sdk/opends/resource/upgrade.bat @@ -34,10 +34,10 @@ set INSTANCE_DIR=%%a ) set CUR_DIR=%~dp0 -cd %INSTALL_ROOT% -cd %INSTANCE_DIR% +cd /d %INSTALL_ROOT% +cd /d %INSTANCE_DIR% set INSTANCE_ROOT=%CD% -cd %CUR_DIR% +cd /d %CUR_DIR% :checkNewVersion if exist "upgrade.bat.NEW" goto newVersion -- Gitblit v1.10.0