From 2bdfe7a8692dc4bd4d6dbdac53e4babc188f413f Mon Sep 17 00:00:00 2001
From: Valery Kharseko <vharseko@3a-systems.ru>
Date: Fri, 21 Nov 2025 21:09:05 +0000
Subject: [PATCH] [#577] Windows upgrading with Upgrade.bat: an error with "" unexpected (#578)
---
opendj-server-legacy/resource/upgrade.bat | 2 +-
.github/workflows/build.yml | 6 ++++++
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cbd8ea2..8e3e02f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -63,6 +63,8 @@
opendj-server-legacy/target/package/opendj/bin/dsconfig create-backend --hostname localhost --port 4444 --bindDN "cn=Directory Manager" --bindPassword password --backend-name=example2 --type je --set=base-dn:dc=example2,dc=com --set=enabled:true --no-prompt --trustAll
opendj-server-legacy/target/package/opendj/bin/makeldif -o /tmp/test.ldif -c suffix=dc=example2,dc=com opendj-server-legacy/target/package/opendj/config/MakeLDIF/example.template
opendj-server-legacy/target/package/opendj/bin/stop-ds
+ echo "4.9.9.0" > opendj-server-legacy/target/package/opendj/config/buildinfo
+ opendj-server-legacy/target/package/opendj/upgrade -n
opendj-server-legacy/target/package/opendj/bin/import-ldif --offline --ldifFile /tmp/test.ldif --backendID=example2
opendj-server-legacy/target/package/opendj/bin/rebuild-index --offline --bindDN "cn=Directory Manager" --bindPassword password --baseDN "dc=example2,dc=com" --rebuildAll
opendj-server-legacy/target/package/opendj/bin/start-ds
@@ -119,6 +121,8 @@
opendj-server-legacy/target/package/opendj/bin/dsconfig create-backend --hostname localhost --port 4444 --bindDN "cn=Directory Manager" --bindPassword password --backend-name=example2 --type je --set=base-dn:dc=example2,dc=com --set=enabled:true --no-prompt --trustAll
opendj-server-legacy/target/package/opendj/bin/makeldif -o /tmp/test.ldif -c suffix=dc=example2,dc=com opendj-server-legacy/target/package/opendj/config/MakeLDIF/example.template
opendj-server-legacy/target/package/opendj/bin/stop-ds
+ echo "4.9.9.0" > opendj-server-legacy/target/package/opendj/config/buildinfo
+ opendj-server-legacy/target/package/opendj/upgrade -n
opendj-server-legacy/target/package/opendj/bin/import-ldif --offline --ldifFile /tmp/test.ldif --backendID=example2
opendj-server-legacy/target/package/opendj/bin/rebuild-index --offline --bindDN "cn=Directory Manager" --bindPassword password --baseDN "dc=example2,dc=com" --rebuildAll
opendj-server-legacy/target/package/opendj/bin/start-ds
@@ -167,6 +171,8 @@
opendj-server-legacy\target\package\opendj\bat\dsconfig.bat create-backend --hostname localhost --port 4444 --bindDN "cn=Directory Manager" --bindPassword password --backend-name=example2 --type je --set=base-dn:dc=example2,dc=com --set=enabled:true --no-prompt --trustAll
opendj-server-legacy\target\package\opendj\bat\makeldif.bat -o test.ldif -c suffix=dc=example2,dc=com opendj-server-legacy\target\package\opendj\config\MakeLDIF\example.template
opendj-server-legacy\target\package\opendj\bat\stop-ds.bat
+ echo "4.9.9.0" > opendj-server-legacy\target\package\opendj\config\buildinfo
+ opendj-server-legacy\target\package\opendj\upgrade.bat
opendj-server-legacy\target\package\opendj\bat\import-ldif.bat --offline --ldifFile test.ldif --backendID=example2
opendj-server-legacy\target\package\opendj\bat\rebuild-index.bat --offline --bindDN "cn=Directory Manager" --bindPassword password --baseDN "dc=example2,dc=com" --rebuildAll
opendj-server-legacy\target\package\opendj\bat\start-ds.bat
diff --git a/opendj-server-legacy/resource/upgrade.bat b/opendj-server-legacy/resource/upgrade.bat
index c114ebd..b24f105 100644
--- a/opendj-server-legacy/resource/upgrade.bat
+++ b/opendj-server-legacy/resource/upgrade.bat
@@ -36,7 +36,7 @@
set DIR_CLASSES="%INSTANCE_ROOT%\classes"
rem The upgrade is not compatible with patches. If the folder is not empty
rem we renamed it as "classes.disabled", and the upgrade process should be launched properly.
-IF EXIST "%DIR_CLASSES%" (
+IF EXIST %DIR_CLASSES% (
for /F %%i in ('dir /b %DIR_CLASSES%\*.*') do goto renamePatchesFolder
)
goto end
--
Gitblit v1.10.0