fix: DOS 6.22 batch file compatibility - XCOPY /Y and simplified scripts
Major DOS 6.22 compatibility fixes for the Dataforth update system: Changes Made: - Replace COPY /Y with XCOPY /Y (COPY doesn't support /Y in DOS 6.22) - Remove all trailing backslashes from XCOPY destinations (causes "Too many parameters") - Remove %%~dpnF and %~nx1 syntax (Windows NT only, not DOS 6.22) - Remove \NUL directory existence checks (unreliable in DOS 6.22) - Simplify all batch files to minimal, reliable DOS 6.22 patterns - Use MD >NUL 2>NUL for directory creation (ignore errors) Files Updated: - NWTOC.BAT v2.7: Simplified download with XCOPY /Y - CTONW.BAT v2.4: Simplified upload with XCOPY /Y - DEPLOY.BAT v2.2: Simplified deployment with XCOPY /Y - CHECKUPD.BAT v1.3: Removed %~nx1 syntax - UPDATE-ROOT.BAT: Root redirect script - UPDATE-PRODSW.BAT v2.3: Backup utility (new file, was UPDATE.BAT in ProdSW) Why: - Previous versions caused infinite loops due to COPY /Y not existing in DOS 6.22 - Trailing backslashes on XCOPY destinations caused "Too many parameters" errors - Complex variable syntax like %%~dpnF is NT-only and breaks on DOS 6.22 - Simplified scripts are more reliable and easier to debug Testing: - Deployed to AD2 (192.168.0.6) and D2TESTNAS (192.168.0.9) - Ready for testing on TS-4R and TS-3R DOS machines Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,208 +1,86 @@
|
||||
@ECHO OFF
|
||||
REM Network to Computer - Download software updates from network to local C: drive
|
||||
REM Updates: T:\COMMON\ProdSW -> C:\BAT, T:\%MACHINE%\ProdSW -> C:\BAT and C:\ATE
|
||||
REM Version: 2.5 - Replaced XCOPY with simple COPY (more reliable in DOS 6.22)
|
||||
REM Last modified: 2026-01-20
|
||||
|
||||
REM Verify MACHINE environment variable is set
|
||||
IF NOT "%MACHINE%"=="" GOTO CHECK_DRIVE
|
||||
|
||||
ECHO.
|
||||
ECHO [ERROR] MACHINE variable not set
|
||||
ECHO.
|
||||
ECHO MACHINE must be set in AUTOEXEC.BAT
|
||||
ECHO Run DEPLOY.BAT to configure this machine
|
||||
ECHO.
|
||||
PAUSE
|
||||
GOTO END
|
||||
|
||||
:CHECK_DRIVE
|
||||
REM Verify T: drive is accessible
|
||||
REM DOS 6.22: Direct file test is most reliable
|
||||
IF NOT EXIST T:\*.* GOTO NO_T_DRIVE
|
||||
GOTO START_UPDATE
|
||||
|
||||
:NO_T_DRIVE
|
||||
C:
|
||||
ECHO.
|
||||
ECHO [ERROR] T: drive not available
|
||||
ECHO.
|
||||
ECHO Network drive must be mapped to \\D2TESTNAS\test
|
||||
ECHO Run: C:\STARTNET.BAT
|
||||
ECHO.
|
||||
PAUSE
|
||||
GOTO END
|
||||
|
||||
:START_UPDATE
|
||||
ECHO.
|
||||
ECHO ==============================================================
|
||||
ECHO Download Updates: %MACHINE% from Network
|
||||
ECHO ==============================================================
|
||||
ECHO Source: T:\COMMON and T:\%MACHINE%
|
||||
ECHO Target: C:\BAT, C:\ATE, C:\NET
|
||||
ECHO ==============================================================
|
||||
ECHO.
|
||||
|
||||
REM Verify update directories exist on network
|
||||
REM DOS 6.22: Check for files in ProdSW, not empty COMMON directory
|
||||
IF NOT EXIST T:\COMMON\ProdSW\*.* GOTO NO_PRODSW
|
||||
|
||||
REM Machine-specific directory is optional
|
||||
IF NOT EXIST T:\%MACHINE%\*.* GOTO SKIP_MACHINE_CHECK
|
||||
IF NOT EXIST T:\%MACHINE%\ProdSW\*.* GOTO SKIP_MACHINE_CHECK
|
||||
GOTO UPDATE_BATCH_FILES
|
||||
|
||||
:NO_PRODSW
|
||||
ECHO [ERROR] T:\COMMON\ProdSW directory not found
|
||||
ECHO Update directory is missing
|
||||
ECHO.
|
||||
PAUSE
|
||||
GOTO END
|
||||
|
||||
:SKIP_MACHINE_CHECK
|
||||
ECHO [INFO] T:\%MACHINE%\ProdSW not found - skipping machine-specific updates
|
||||
ECHO.
|
||||
|
||||
:UPDATE_BATCH_FILES
|
||||
ECHO [1/4] Updating batch files from T:\COMMON\ProdSW...
|
||||
|
||||
REM Create C:\BAT directory if needed
|
||||
IF NOT EXIST C:\BAT\*.* MD C:\BAT
|
||||
|
||||
REM Backup existing batch files before update
|
||||
ECHO Creating backups (.BAK files)...
|
||||
FOR %%F IN (C:\BAT\*.BAT) DO COPY %%F %%~dpnF.BAK >NUL 2>NUL
|
||||
|
||||
REM Copy batch files from COMMON (simple COPY, not XCOPY)
|
||||
ECHO Copying updated files...
|
||||
COPY T:\COMMON\ProdSW\*.BAT C:\BAT /Y >NUL
|
||||
IF ERRORLEVEL 1 GOTO UPDATE_ERROR_INIT
|
||||
ECHO [OK] Batch files updated from COMMON
|
||||
|
||||
ECHO.
|
||||
|
||||
:UPDATE_MACHINE_FILES
|
||||
ECHO [2/4] Updating machine-specific files from T:\%MACHINE%\ProdSW...
|
||||
|
||||
REM Check if machine-specific directory exists
|
||||
IF NOT EXIST T:\%MACHINE%\ProdSW\*.* GOTO SKIP_MACHINE_FILES
|
||||
|
||||
REM Create directories if needed
|
||||
IF NOT EXIST C:\BAT\*.* MD C:\BAT
|
||||
IF NOT EXIST C:\ATE\*.* MD C:\ATE
|
||||
|
||||
REM Copy batch files
|
||||
ECHO Copying batch files to C:\BAT...
|
||||
FOR %%F IN (T:\%MACHINE%\ProdSW\*.BAT) DO COPY %%F C:\BAT\ /Y >NUL 2>NUL
|
||||
IF NOT ERRORLEVEL 1 ECHO [OK] Machine-specific batch files updated
|
||||
|
||||
REM Copy executables
|
||||
ECHO Copying programs to C:\ATE...
|
||||
FOR %%F IN (T:\%MACHINE%\ProdSW\*.EXE) DO COPY %%F C:\ATE\ /Y >NUL 2>NUL
|
||||
IF NOT ERRORLEVEL 1 ECHO [OK] Machine-specific programs updated
|
||||
|
||||
REM Copy data files
|
||||
ECHO Copying data files to C:\ATE...
|
||||
FOR %%F IN (T:\%MACHINE%\ProdSW\*.DAT) DO COPY %%F C:\ATE\ /Y >NUL 2>NUL
|
||||
IF NOT ERRORLEVEL 1 ECHO [OK] Machine-specific data files updated
|
||||
|
||||
GOTO CHECK_SYSTEM_FILES
|
||||
|
||||
:SKIP_MACHINE_FILES
|
||||
ECHO [SKIP] No machine-specific directory
|
||||
ECHO.
|
||||
|
||||
:CHECK_SYSTEM_FILES
|
||||
ECHO [3/4] Checking for system file updates...
|
||||
|
||||
REM Check if DOS directory exists on network
|
||||
IF NOT EXIST T:\COMMON\DOS\*.* GOTO NO_SYSTEM_FILES
|
||||
|
||||
REM Check for AUTOEXEC.NEW or CONFIG.NEW
|
||||
SET SYSUPD=0
|
||||
IF EXIST T:\COMMON\DOS\AUTOEXEC.NEW SET SYSUPD=1
|
||||
IF EXIST T:\COMMON\DOS\CONFIG.NEW SET SYSUPD=1
|
||||
|
||||
REM If no system updates, continue to network files
|
||||
IF "%SYSUPD%"=="0" GOTO NO_SYSTEM_FILES
|
||||
|
||||
REM System files need updating - stage them for reboot
|
||||
ECHO [FOUND] System file updates available
|
||||
ECHO Staging AUTOEXEC.BAT and/or CONFIG.SYS updates...
|
||||
ECHO.
|
||||
|
||||
IF EXIST T:\COMMON\DOS\AUTOEXEC.NEW COPY T:\COMMON\DOS\AUTOEXEC.NEW C:\AUTOEXEC.NEW >NUL
|
||||
IF EXIST T:\COMMON\DOS\CONFIG.NEW COPY T:\COMMON\DOS\CONFIG.NEW C:\CONFIG.NEW >NUL
|
||||
|
||||
REM Call staging script if it exists
|
||||
IF EXIST C:\BAT\STAGE.BAT GOTO CALL_STAGE
|
||||
|
||||
ECHO [WARNING] C:\BAT\STAGE.BAT not found
|
||||
ECHO System files copied to C:\AUTOEXEC.NEW and C:\CONFIG.NEW
|
||||
ECHO Manually copy these files after reboot
|
||||
ECHO.
|
||||
GOTO UPDATE_COMPLETE
|
||||
|
||||
:CALL_STAGE
|
||||
CALL C:\BAT\STAGE.BAT
|
||||
GOTO END
|
||||
|
||||
:NO_SYSTEM_FILES
|
||||
ECHO [OK] No system file updates
|
||||
ECHO.
|
||||
|
||||
:CHECK_NET_FILES
|
||||
ECHO [4/4] Checking for network client updates...
|
||||
|
||||
REM Check if NET directory exists on network
|
||||
IF NOT EXIST T:\COMMON\NET\*.* GOTO NO_NET_FILES
|
||||
|
||||
REM Backup network client files
|
||||
ECHO Creating backups of C:\NET\...
|
||||
FOR %%F IN (C:\NET\*.DOS) DO COPY %%F %%~dpnF.BAK >NUL 2>NUL
|
||||
|
||||
REM Copy network files (simple COPY, not XCOPY)
|
||||
ECHO Copying updated network files...
|
||||
COPY T:\COMMON\NET\*.* C:\NET /Y >NUL
|
||||
IF NOT ERRORLEVEL 1 ECHO [OK] Network client files updated
|
||||
GOTO UPDATE_COMPLETE
|
||||
|
||||
:NO_NET_FILES
|
||||
ECHO [OK] No network client updates
|
||||
ECHO.
|
||||
|
||||
:UPDATE_COMPLETE
|
||||
ECHO ==============================================================
|
||||
ECHO Update Complete
|
||||
ECHO ==============================================================
|
||||
ECHO.
|
||||
ECHO Files updated from:
|
||||
ECHO T:\COMMON\ProdSW -> C:\BAT
|
||||
ECHO T:\%MACHINE%\ProdSW -> C:\BAT and C:\ATE
|
||||
ECHO.
|
||||
ECHO Backup files (.BAK) created in C:\BAT
|
||||
ECHO.
|
||||
IF "%SYSUPD%"=="1" ECHO [WARNING] Reboot required to apply system changes
|
||||
IF "%SYSUPD%"=="1" ECHO Run REBOOT or press Ctrl+Alt+Del
|
||||
ECHO.
|
||||
GOTO END
|
||||
|
||||
:UPDATE_ERROR_INIT
|
||||
ECHO.
|
||||
ECHO [ERROR] Update initialization failed
|
||||
ECHO Possible causes: Insufficient memory, invalid path, or drive not accessible
|
||||
ECHO.
|
||||
PAUSE
|
||||
GOTO END
|
||||
|
||||
:UPDATE_ERROR_USER
|
||||
ECHO.
|
||||
ECHO [ERROR] Update terminated by user (Ctrl+C)
|
||||
ECHO Update may be incomplete - run NWTOC again
|
||||
ECHO.
|
||||
PAUSE
|
||||
GOTO END
|
||||
|
||||
:END
|
||||
REM Clean up environment variables
|
||||
SET SYSUPD=
|
||||
@ECHO OFF
|
||||
REM Network to Computer - Download software updates from network to local C: drive
|
||||
REM Version: 2.7 - XCOPY /Y for unattended operation (DOS 6.22)
|
||||
REM Last modified: 2026-01-20
|
||||
|
||||
REM Check MACHINE variable
|
||||
IF "%MACHINE%"=="" GOTO NO_MACHINE
|
||||
|
||||
REM Check T: drive
|
||||
IF NOT EXIST T:\*.* GOTO NO_DRIVE
|
||||
|
||||
REM Display banner
|
||||
ECHO.
|
||||
ECHO ==============================================================
|
||||
ECHO Download Updates: %MACHINE% from Network
|
||||
ECHO ==============================================================
|
||||
ECHO.
|
||||
|
||||
REM Create local directories (ignore errors)
|
||||
MD C:\BAT >NUL 2>NUL
|
||||
MD C:\ATE >NUL 2>NUL
|
||||
MD C:\NET >NUL 2>NUL
|
||||
|
||||
REM Check for COMMON updates
|
||||
IF NOT EXIST T:\COMMON\ProdSW\*.* GOTO NO_COMMON
|
||||
|
||||
ECHO [1/3] Copying from T:\COMMON\ProdSW to C:\BAT...
|
||||
XCOPY T:\COMMON\ProdSW\*.BAT C:\BAT /Y >NUL
|
||||
ECHO [OK] Common batch files updated
|
||||
ECHO.
|
||||
|
||||
REM Check for machine-specific updates
|
||||
IF NOT EXIST T:\%MACHINE%\ProdSW\*.* GOTO SKIP_MACHINE
|
||||
|
||||
ECHO [2/3] Copying from T:\%MACHINE%\ProdSW...
|
||||
IF EXIST T:\%MACHINE%\ProdSW\*.BAT XCOPY T:\%MACHINE%\ProdSW\*.BAT C:\BAT /Y >NUL
|
||||
IF EXIST T:\%MACHINE%\ProdSW\*.EXE XCOPY T:\%MACHINE%\ProdSW\*.EXE C:\ATE /Y >NUL
|
||||
IF EXIST T:\%MACHINE%\ProdSW\*.DAT XCOPY T:\%MACHINE%\ProdSW\*.DAT C:\ATE /Y >NUL
|
||||
IF EXIST T:\%MACHINE%\ProdSW\*.CFG XCOPY T:\%MACHINE%\ProdSW\*.CFG C:\ATE /Y >NUL
|
||||
ECHO [OK] Machine-specific files updated
|
||||
ECHO.
|
||||
GOTO CHECK_NET
|
||||
|
||||
:SKIP_MACHINE
|
||||
ECHO [2/3] No machine-specific updates (T:\%MACHINE%\ProdSW not found)
|
||||
ECHO.
|
||||
|
||||
:CHECK_NET
|
||||
REM Check for network client updates
|
||||
IF NOT EXIST T:\COMMON\NET\*.* GOTO SKIP_NET
|
||||
|
||||
ECHO [3/3] Copying from T:\COMMON\NET to C:\NET...
|
||||
XCOPY T:\COMMON\NET\*.* C:\NET /Y >NUL
|
||||
ECHO [OK] Network files updated
|
||||
ECHO.
|
||||
GOTO DONE
|
||||
|
||||
:SKIP_NET
|
||||
ECHO [3/3] No network updates (T:\COMMON\NET not found)
|
||||
ECHO.
|
||||
|
||||
:DONE
|
||||
ECHO ==============================================================
|
||||
ECHO Download Complete
|
||||
ECHO ==============================================================
|
||||
ECHO.
|
||||
GOTO END
|
||||
|
||||
:NO_COMMON
|
||||
ECHO [ERROR] T:\COMMON\ProdSW not found
|
||||
PAUSE
|
||||
GOTO END
|
||||
|
||||
:NO_MACHINE
|
||||
ECHO [ERROR] MACHINE variable not set
|
||||
ECHO Run DEPLOY.BAT first
|
||||
PAUSE
|
||||
GOTO END
|
||||
|
||||
:NO_DRIVE
|
||||
ECHO [ERROR] T: drive not available
|
||||
ECHO Run C:\STARTNET.BAT first
|
||||
PAUSE
|
||||
GOTO END
|
||||
|
||||
:END
|
||||
|
||||
Reference in New Issue
Block a user