From 4b290df5155c8b3bc4261cc3bd9ddd1f54f0fd64 Mon Sep 17 00:00:00 2001 From: Peter Ferrie Date: Sun, 5 Apr 2020 12:37:13 -0700 Subject: [PATCH] strip CR from credits and helptext --- bin/dumpcr.js | 2 +- bin/rsync.js | 2 +- winmake.bat | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bin/dumpcr.js b/bin/dumpcr.js index 8afa2b815..abb598e66 100644 --- a/bin/dumpcr.js +++ b/bin/dumpcr.js @@ -8,7 +8,7 @@ if (d.substr(0, 2) == '*.') } for (b = new Enumerator(a.GetFolder(c).files); !b.atEnd(); b.moveNext()) { - if ((d == '*') || (d == a.getextensionname(b.item().name))) + if ((d == '*') || (d == b.item().name) || (d == a.getextensionname(b.item().name))) { e = a.opentextfile(c + b.item().name).readall() e = e.replace(/\r\n/g, "\n") diff --git a/bin/rsync.js b/bin/rsync.js index 3dced8eef..aec73f0ae 100644 --- a/bin/rsync.js +++ b/bin/rsync.js @@ -8,7 +8,7 @@ if (d.substr(0, 2) == '*.') } for (b = new Enumerator(a.GetFolder(c).files); !b.atEnd(); b.moveNext()) { - if ((d == '*') || (d == a.getextensionname(b.item().name))) + if ((d == '*') || (d == b.item().name) || (d == a.getextensionname(b.item().name))) { e = WScript.Arguments(1) + "\\" + b.item().Name if (!a.fileexists(e) || (a.getfile(e).datelastmodified < b.item().datelastmodified)) diff --git a/winmake.bat b/winmake.bat index 1195ddb25..6b95f78a4 100644 --- a/winmake.bat +++ b/winmake.bat @@ -52,8 +52,12 @@ cscript /nologo bin\padto.js 512 build\PREFS.CONF %CADIUS% ADDFILE "build\%DISK%" "/%VOLUME%/" "res\HELP" >>build\log for %%q in (res\*.CONF) do if "%%q" neq "res\PREFS.CONF" %CADIUS% ADDFILE "build\%DISK%" "/%VOLUME%/" "%%q" >>build\log %CADIUS% ADDFILE "build\%DISK%" "/%VOLUME%/" "build\PREFS.CONF" >>build\log -%CADIUS% ADDFILE "build\%DISK%" "/%VOLUME%/" "res\CREDITS" >>build\log -%CADIUS% ADDFILE "build\%DISK%" "/%VOLUME%/" "res\HELPTEXT" >>build\log +cscript /nologo bin\rsync.js "res\CREDITS" "build\" >>build\log +cscript /nologo bin\dumpcr.js "build\CREDITS" +%CADIUS% ADDFILE "build\%DISK%" "/%VOLUME%/" "build\CREDITS" >>build\log +cscript /nologo bin\rsync.js "res\HELPTEXT" "build\" >>build\log +cscript /nologo bin\dumpcr.js "build\HELPTEXT" +%CADIUS% ADDFILE "build\%DISK%" "/%VOLUME%/" "build\HELPTEXT" >>build\log %CADIUS% ADDFILE "build\%DISK%" "/%VOLUME%/" "res\DECRUNCH" >>build\log %CADIUS% ADDFOLDER "build\%DISK%" "/%VOLUME%/TITLE.HGR" "res\TITLE.HGR" >>build\log %CADIUS% ADDFOLDER "build\%DISK%" "/%VOLUME%/TITLE.DHGR" "res\TITLE.DHGR" >>build\log