From 5413b9f7b1cea751cfc933eecd83b5af30987c5c Mon Sep 17 00:00:00 2001
From: dugan <dugan@localhost>
Date: Mon, 23 Jul 2007 18:54:58 +0000
Subject: [PATCH] Back out changes made for issue #1985 due to apparent problems with windows 2000.
---
opendj-sdk/opends/resource/bin/_server-script.bat | 2
opendj-sdk/opends/resource/bin/dsconfig.bat | 2
opendj-sdk/opends/resource/uninstall.bat | 2
opendj-sdk/opends/resource/bin/ldifmodify.bat | 2
opendj-sdk/opends/resource/bin/ldappasswordmodify.bat | 2
opendj-sdk/opends/resource/bin/status-panel.bat | 2
opendj-sdk/opends/resource/bin/ldifsearch.bat | 2
opendj-sdk/opends/resource/setup.bat | 4 +-
opendj-sdk/opends/resource/bin/_client-script.bat | 2
opendj-sdk/opends/resource/bin/restore.bat | 2
opendj-sdk/opends/resource/bin/verify-index.bat | 2
opendj-sdk/opends/resource/bin/ldapmodify.bat | 2
opendj-sdk/opends/resource/bin/ldapcompare.bat | 2
opendj-sdk/opends/resource/bin/stop-ds.bat | 2
opendj-sdk/opends/resource/bin/rebuild-index.bat | 2
opendj-sdk/opends/resource/upgrade.bat | 2
opendj-sdk/opends/resource/bin/manage-account.bat | 2
opendj-sdk/opends/resource/bin/status.bat | 2
opendj-sdk/opends/resource/bin/windows-service.bat | 2
opendj-sdk/opends/resource/bin/backup.bat | 2
opendj-sdk/opends/resource/bin/configure-ds.bat | 2
opendj-sdk/opends/resource/bin/ldif-diff.bat | 2
opendj-sdk/opends/resource/bin/start-ds.bat | 2
opendj-sdk/opends/resource/bin/ldapdelete.bat | 2
opendj-sdk/opends/resource/bin/make-ldif.bat | 2
opendj-sdk/opends/resource/bin/ldapsearch.bat | 2
opendj-sdk/opends/resource/bin/dsframework.bat | 2
opendj-sdk/opends/resource/bin/import-ldif.bat | 2
opendj-sdk/opends/resource/bin/export-ldif.bat | 2
opendj-sdk/opends/resource/bin/encode-password.bat | 2
opendj-sdk/opends/resource/bin/list-backends.bat | 2
31 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 49e7a5a..343eaeb 100644
--- a/opendj-sdk/opends/resource/bin/_client-script.bat
+++ b/opendj-sdk/opends/resource/bin/_client-script.bat
@@ -30,7 +30,7 @@
setlocal
-set DIR_HOME=%~dPs0..
+set DIR_HOME=%~dP0..
set INSTANCE_ROOT=%DIR_HOME%
if "%OPENDS_INVOKE_CLASS%" == "" goto noInvokeClass
diff --git a/opendj-sdk/opends/resource/bin/_server-script.bat b/opendj-sdk/opends/resource/bin/_server-script.bat
index 55742f8..d57b5c1 100644
--- a/opendj-sdk/opends/resource/bin/_server-script.bat
+++ b/opendj-sdk/opends/resource/bin/_server-script.bat
@@ -30,7 +30,7 @@
setlocal
-set DIR_HOME=%~dPs0..
+set DIR_HOME=%~dP0..
set INSTANCE_ROOT=%DIR_HOME%
if "%OPENDS_INVOKE_CLASS%" == "" goto noInvokeClass
diff --git a/opendj-sdk/opends/resource/bin/backup.bat b/opendj-sdk/opends/resource/bin/backup.bat
index 2839f48..85748bb 100644
--- a/opendj-sdk/opends/resource/bin/backup.bat
+++ b/opendj-sdk/opends/resource/bin/backup.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.BackUpDB"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=backup"
-call "%~dPs0\..\lib\_server-script.bat" %*
+call "%~dP0\..\lib\_server-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/configure-ds.bat b/opendj-sdk/opends/resource/bin/configure-ds.bat
index 75908f2..2992fe9 100644
--- a/opendj-sdk/opends/resource/bin/configure-ds.bat
+++ b/opendj-sdk/opends/resource/bin/configure-ds.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.ConfigureDS"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=configure-ds"
-call "%~dPs0\..\lib\_server-script.bat" %*
+call "%~dP0\..\lib\_server-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/dsconfig.bat b/opendj-sdk/opends/resource/bin/dsconfig.bat
index be62054..d2ea99f 100644
--- a/opendj-sdk/opends/resource/bin/dsconfig.bat
+++ b/opendj-sdk/opends/resource/bin/dsconfig.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.dsconfig.DSConfig"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=dsconfig"
-call "%~dPs0\..\lib\_client-script.bat" %*
+call "%~dP0\..\lib\_client-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/dsframework.bat b/opendj-sdk/opends/resource/bin/dsframework.bat
index 67340e4..02c97fa 100644
--- a/opendj-sdk/opends/resource/bin/dsframework.bat
+++ b/opendj-sdk/opends/resource/bin/dsframework.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.admin.client.cli.DsFrameworkCliMain"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=dsframework"
-call "%~dPs0\..\lib\_client-script.bat" %*
+call "%~dP0\..\lib\_client-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/encode-password.bat b/opendj-sdk/opends/resource/bin/encode-password.bat
index d313619..34c0143 100644
--- a/opendj-sdk/opends/resource/bin/encode-password.bat
+++ b/opendj-sdk/opends/resource/bin/encode-password.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.EncodePassword"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=encode-password"
-call "%~dPs0\..\lib\_server-script.bat" %*
+call "%~dP0\..\lib\_server-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/export-ldif.bat b/opendj-sdk/opends/resource/bin/export-ldif.bat
index ba1d79c..9e2cdcc 100644
--- a/opendj-sdk/opends/resource/bin/export-ldif.bat
+++ b/opendj-sdk/opends/resource/bin/export-ldif.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.ExportLDIF"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=export-ldif"
-call "%~dPs0\..\lib\_server-script.bat" %*
+call "%~dP0\..\lib\_server-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/import-ldif.bat b/opendj-sdk/opends/resource/bin/import-ldif.bat
index 7fc8e4f..740e735 100644
--- a/opendj-sdk/opends/resource/bin/import-ldif.bat
+++ b/opendj-sdk/opends/resource/bin/import-ldif.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.ImportLDIF"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=import-ldif"
-call "%~dPs0\..\lib\_server-script.bat" %*
+call "%~dP0\..\lib\_server-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/ldapcompare.bat b/opendj-sdk/opends/resource/bin/ldapcompare.bat
index 5fdd4c0..9a2b78a 100644
--- a/opendj-sdk/opends/resource/bin/ldapcompare.bat
+++ b/opendj-sdk/opends/resource/bin/ldapcompare.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.LDAPCompare"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=ldapcompare"
-call "%~dPs0\..\lib\_client-script.bat" %*
+call "%~dP0\..\lib\_client-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/ldapdelete.bat b/opendj-sdk/opends/resource/bin/ldapdelete.bat
index 4fb588e..54af183 100644
--- a/opendj-sdk/opends/resource/bin/ldapdelete.bat
+++ b/opendj-sdk/opends/resource/bin/ldapdelete.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.LDAPDelete"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=ldapdelete"
-call "%~dPs0\..\lib\_client-script.bat" %*
+call "%~dP0\..\lib\_client-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/ldapmodify.bat b/opendj-sdk/opends/resource/bin/ldapmodify.bat
index 38ef9b7..fca9c92 100644
--- a/opendj-sdk/opends/resource/bin/ldapmodify.bat
+++ b/opendj-sdk/opends/resource/bin/ldapmodify.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.LDAPModify"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=ldapmodify"
-call "%~dPs0\..\lib\_client-script.bat" %*
+call "%~dP0\..\lib\_client-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/ldappasswordmodify.bat b/opendj-sdk/opends/resource/bin/ldappasswordmodify.bat
index 160cba3..434ef40 100644
--- a/opendj-sdk/opends/resource/bin/ldappasswordmodify.bat
+++ b/opendj-sdk/opends/resource/bin/ldappasswordmodify.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.LDAPPasswordModify"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=ldappasswordmodify"
-call "%~dPs0\..\lib\_client-script.bat" %*
+call "%~dP0\..\lib\_client-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/ldapsearch.bat b/opendj-sdk/opends/resource/bin/ldapsearch.bat
index 38e9ce5..afb9db2 100644
--- a/opendj-sdk/opends/resource/bin/ldapsearch.bat
+++ b/opendj-sdk/opends/resource/bin/ldapsearch.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.LDAPSearch"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=ldapsearch"
-call "%~dPs0\..\lib\_client-script.bat" %*
+call "%~dP0\..\lib\_client-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/ldif-diff.bat b/opendj-sdk/opends/resource/bin/ldif-diff.bat
index c2a7b79..1052bef 100644
--- a/opendj-sdk/opends/resource/bin/ldif-diff.bat
+++ b/opendj-sdk/opends/resource/bin/ldif-diff.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.LDIFDiff"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=ldif-diff"
-call "%~dPs0\..\lib\_client-script.bat" %*
+call "%~dP0\..\lib\_client-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/ldifmodify.bat b/opendj-sdk/opends/resource/bin/ldifmodify.bat
index f657e40..e2ec712 100644
--- a/opendj-sdk/opends/resource/bin/ldifmodify.bat
+++ b/opendj-sdk/opends/resource/bin/ldifmodify.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.LDIFModify"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=ldifmodify"
-call "%~dPs0\..\lib\_server-script.bat" %*
+call "%~dP0\..\lib\_server-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/ldifsearch.bat b/opendj-sdk/opends/resource/bin/ldifsearch.bat
index ccd16b7..e9aa749 100644
--- a/opendj-sdk/opends/resource/bin/ldifsearch.bat
+++ b/opendj-sdk/opends/resource/bin/ldifsearch.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.LDIFSearch"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=ldifsearch"
-call "%~dPs0\..\lib\_server-script.bat" %*
+call "%~dP0\..\lib\_server-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/list-backends.bat b/opendj-sdk/opends/resource/bin/list-backends.bat
index 197e37c..ff1edbe 100644
--- a/opendj-sdk/opends/resource/bin/list-backends.bat
+++ b/opendj-sdk/opends/resource/bin/list-backends.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.ListBackends"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=list-backends"
-call "%~dPs0\..\lib\_server-script.bat" %*
+call "%~dP0\..\lib\_server-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/make-ldif.bat b/opendj-sdk/opends/resource/bin/make-ldif.bat
index dc3da97..0ba5232 100644
--- a/opendj-sdk/opends/resource/bin/make-ldif.bat
+++ b/opendj-sdk/opends/resource/bin/make-ldif.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.makeldif.MakeLDIF"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=make-ldif"
-call "%~dPs0\..\lib\_server-script.bat" --resourcePath "%~dPs0..\config\MakeLDIF" %*
+call "%~dP0\..\lib\_server-script.bat" --resourcePath "%~dP0..\config\MakeLDIF" %*
diff --git a/opendj-sdk/opends/resource/bin/manage-account.bat b/opendj-sdk/opends/resource/bin/manage-account.bat
index 3eaeb64..30f3bac 100644
--- a/opendj-sdk/opends/resource/bin/manage-account.bat
+++ b/opendj-sdk/opends/resource/bin/manage-account.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.ManageAccount"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=manage-account"
-call "%~dPs0\..\lib\_client-script.bat" %*
+call "%~dP0\..\lib\_client-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/rebuild-index.bat b/opendj-sdk/opends/resource/bin/rebuild-index.bat
index ac8575e..ec5af25 100644
--- a/opendj-sdk/opends/resource/bin/rebuild-index.bat
+++ b/opendj-sdk/opends/resource/bin/rebuild-index.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.RebuildIndex"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=rebuild-index"
-call "%~dPs0\..\lib\_server-script.bat" %*
+call "%~dP0\..\lib\_server-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/restore.bat b/opendj-sdk/opends/resource/bin/restore.bat
index 0144756..bfd31ec 100644
--- a/opendj-sdk/opends/resource/bin/restore.bat
+++ b/opendj-sdk/opends/resource/bin/restore.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.RestoreDB"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=restore"
-call "%~dPs0\..\lib\_server-script.bat" %*
+call "%~dP0\..\lib\_server-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/start-ds.bat b/opendj-sdk/opends/resource/bin/start-ds.bat
index 7e7acdb..c4e2efb 100644
--- a/opendj-sdk/opends/resource/bin/start-ds.bat
+++ b/opendj-sdk/opends/resource/bin/start-ds.bat
@@ -27,7 +27,7 @@
setlocal
-set DIR_HOME=%~dPs0..
+set DIR_HOME=%~dP0..
set INSTANCE_ROOT=%DIR_HOME%
set LOG="%INSTANCE_ROOT%\logs\native-windows.out"
diff --git a/opendj-sdk/opends/resource/bin/status-panel.bat b/opendj-sdk/opends/resource/bin/status-panel.bat
index 5faa956..952481d 100644
--- a/opendj-sdk/opends/resource/bin/status-panel.bat
+++ b/opendj-sdk/opends/resource/bin/status-panel.bat
@@ -27,7 +27,7 @@
setlocal
-set DIR_HOME=%~dPs0..
+set DIR_HOME=%~dP0..
set INSTANCE_ROOT=%DIR_HOME%
:checkJavaBin
diff --git a/opendj-sdk/opends/resource/bin/status.bat b/opendj-sdk/opends/resource/bin/status.bat
index 49bcc22..967eee2 100644
--- a/opendj-sdk/opends/resource/bin/status.bat
+++ b/opendj-sdk/opends/resource/bin/status.bat
@@ -29,4 +29,4 @@
set OPENDS_INVOKE_CLASS="org.opends.statuspanel.StatusCli"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=status"
-call "%~dPs0\..\lib\_server-script.bat" %*
+call "%~dP0\..\lib\_server-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/stop-ds.bat b/opendj-sdk/opends/resource/bin/stop-ds.bat
index c8e26e7..2e9c88c 100644
--- a/opendj-sdk/opends/resource/bin/stop-ds.bat
+++ b/opendj-sdk/opends/resource/bin/stop-ds.bat
@@ -31,7 +31,7 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.StopDS"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=stop-ds"
-set DIR_HOME=%~dPs0..
+set DIR_HOME=%~dP0..
set INSTANCE_ROOT=%DIR_HOME%
diff --git a/opendj-sdk/opends/resource/bin/verify-index.bat b/opendj-sdk/opends/resource/bin/verify-index.bat
index b687ad5..276dbbc 100644
--- a/opendj-sdk/opends/resource/bin/verify-index.bat
+++ b/opendj-sdk/opends/resource/bin/verify-index.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.VerifyIndex"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=verify-index"
-call "%~dPs0\..\lib\_server-script.bat" %*
+call "%~dP0\..\lib\_server-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/windows-service.bat b/opendj-sdk/opends/resource/bin/windows-service.bat
index f19229b..8ee95e4 100644
--- a/opendj-sdk/opends/resource/bin/windows-service.bat
+++ b/opendj-sdk/opends/resource/bin/windows-service.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.ConfigureWindowsService"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=windows-service"
-call "%~dPs0\..\lib\_client-script.bat" %*
+call "%~dP0\..\lib\_client-script.bat" %*
diff --git a/opendj-sdk/opends/resource/setup.bat b/opendj-sdk/opends/resource/setup.bat
index f40bb9f..8fd0f24 100644
--- a/opendj-sdk/opends/resource/setup.bat
+++ b/opendj-sdk/opends/resource/setup.bat
@@ -29,11 +29,11 @@
rem check that the path does not contain the ^% character which breaks
rem the batch files.
-set NON_ESCAPED=%~dP0..
+set NON_ESCAPED=%~dPs0..
FOR /F "tokens=1-2* delims=%%" %%1 IN ("%NON_ESCAPED%") DO (
if NOT "%%2" == "" goto invalidPath)
-set DIR_HOME=%~dPs0.
+set DIR_HOME=%~dP0.
set INSTANCE_ROOT=%DIR_HOME%
:checkJavaBin
diff --git a/opendj-sdk/opends/resource/uninstall.bat b/opendj-sdk/opends/resource/uninstall.bat
index 07ffbc0..f7b2991 100644
--- a/opendj-sdk/opends/resource/uninstall.bat
+++ b/opendj-sdk/opends/resource/uninstall.bat
@@ -27,7 +27,7 @@
setlocal
-set DIR_HOME=%~dPs0.
+set DIR_HOME=%~dP0.
set INSTANCE_ROOT=%DIR_HOME%
:checkJavaBin
diff --git a/opendj-sdk/opends/resource/upgrade.bat b/opendj-sdk/opends/resource/upgrade.bat
index 3c47ee9..726da68 100644
--- a/opendj-sdk/opends/resource/upgrade.bat
+++ b/opendj-sdk/opends/resource/upgrade.bat
@@ -27,7 +27,7 @@
setlocal
-set DIR_HOME=%~dPs0.
+set DIR_HOME=%~dP0.
set INSTANCE_ROOT=%DIR_HOME%
:checkJavaBin
--
Gitblit v1.10.0