Skip to content

Commit 2bdfe7a

Browse files
authored
[#577] Windows upgrading with Upgrade.bat: an error with "" unexpected (#578)
1 parent cea9a85 commit 2bdfe7a

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ jobs:
6363
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
6464
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
6565
opendj-server-legacy/target/package/opendj/bin/stop-ds
66+
echo "4.9.9.0" > opendj-server-legacy/target/package/opendj/config/buildinfo
67+
opendj-server-legacy/target/package/opendj/upgrade -n
6668
opendj-server-legacy/target/package/opendj/bin/import-ldif --offline --ldifFile /tmp/test.ldif --backendID=example2
6769
opendj-server-legacy/target/package/opendj/bin/rebuild-index --offline --bindDN "cn=Directory Manager" --bindPassword password --baseDN "dc=example2,dc=com" --rebuildAll
6870
opendj-server-legacy/target/package/opendj/bin/start-ds
@@ -119,6 +121,8 @@ jobs:
119121
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
120122
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
121123
opendj-server-legacy/target/package/opendj/bin/stop-ds
124+
echo "4.9.9.0" > opendj-server-legacy/target/package/opendj/config/buildinfo
125+
opendj-server-legacy/target/package/opendj/upgrade -n
122126
opendj-server-legacy/target/package/opendj/bin/import-ldif --offline --ldifFile /tmp/test.ldif --backendID=example2
123127
opendj-server-legacy/target/package/opendj/bin/rebuild-index --offline --bindDN "cn=Directory Manager" --bindPassword password --baseDN "dc=example2,dc=com" --rebuildAll
124128
opendj-server-legacy/target/package/opendj/bin/start-ds
@@ -167,6 +171,8 @@ jobs:
167171
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
168172
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
169173
opendj-server-legacy\target\package\opendj\bat\stop-ds.bat
174+
echo "4.9.9.0" > opendj-server-legacy\target\package\opendj\config\buildinfo
175+
opendj-server-legacy\target\package\opendj\upgrade.bat
170176
opendj-server-legacy\target\package\opendj\bat\import-ldif.bat --offline --ldifFile test.ldif --backendID=example2
171177
opendj-server-legacy\target\package\opendj\bat\rebuild-index.bat --offline --bindDN "cn=Directory Manager" --bindPassword password --baseDN "dc=example2,dc=com" --rebuildAll
172178
opendj-server-legacy\target\package\opendj\bat\start-ds.bat

opendj-server-legacy/resource/upgrade.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ cd /d %CUR_DIR%
3636
set DIR_CLASSES="%INSTANCE_ROOT%\classes"
3737
rem The upgrade is not compatible with patches. If the folder is not empty
3838
rem we renamed it as "classes.disabled", and the upgrade process should be launched properly.
39-
IF EXIST "%DIR_CLASSES%" (
39+
IF EXIST %DIR_CLASSES% (
4040
for /F %%i in ('dir /b %DIR_CLASSES%\*.*') do goto renamePatchesFolder
4141
)
4242
goto end

0 commit comments

Comments
 (0)