diff --git a/AUTOEXEC.BAT b/AUTOEXEC.BAT index 5c25b42..cc430db 100644 --- a/AUTOEXEC.BAT +++ b/AUTOEXEC.BAT @@ -66,7 +66,6 @@ ECHO. ECHO To start network manually, run: ECHO C:\NET\STARTNET.BAT ECHO. -ECHO Press any key to continue... PAUSE GOTO SKIP_BACKUP diff --git a/CHECKUPD.BAT b/CHECKUPD.BAT index d9e49f2..a584daf 100644 --- a/CHECKUPD.BAT +++ b/CHECKUPD.BAT @@ -25,7 +25,6 @@ ECHO. ECHO Set MACHINE in AUTOEXEC.BAT: ECHO SET MACHINE=TS-4R ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -50,7 +49,6 @@ ECHO [ERROR] T: drive not available ECHO. ECHO Run: C:\NET\STARTNET.BAT ECHO. -ECHO Press any key to exit... PAUSE GOTO END diff --git a/CTONW.BAT b/CTONW.BAT index 83e1d38..df862c0 100644 --- a/CTONW.BAT +++ b/CTONW.BAT @@ -36,7 +36,6 @@ ECHO Then reboot or run: ECHO SET MACHINE=TS-4R ECHO CTONW ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -70,7 +69,6 @@ ECHO. ECHO Or map manually: ECHO NET USE T: \\D2TESTNAS\test /YES ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -122,7 +120,6 @@ ECHO. ECHO No files were uploaded to COMMON. ECHO To upload to machine-specific location, run: CTONW ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -155,7 +152,6 @@ ECHO [ERROR] C:\BAT directory not found ECHO. ECHO No files to upload. ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -317,7 +313,6 @@ ECHO - Sufficient disk space on T: ECHO - Network connection is stable ECHO - Permissions to create directories ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -332,7 +327,6 @@ ECHO - Sufficient disk space on T: ECHO - Network connection is stable ECHO - Permissions to create directories ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -346,7 +340,6 @@ ECHO - Invalid path ECHO - Target drive not accessible ECHO - Network connection lost ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -357,7 +350,6 @@ ECHO. ECHO Upload may be incomplete! ECHO Run CTONW again to complete upload. ECHO. -ECHO Press any key to exit... PAUSE GOTO END diff --git a/DEPLOY.BAT b/DEPLOY.BAT index 6b557d4..a84da6f 100644 --- a/DEPLOY.BAT +++ b/DEPLOY.BAT @@ -15,6 +15,11 @@ REM Version: 1.0 - DOS 6.22 compatible REM Last modified: 2026-01-19 CLS +REM DEBUG: Show parameters passed to script +ECHO. +ECHO DEBUG: Parameter 1 = [%1] +ECHO DEBUG: Parameter 2 = [%2] +ECHO. ECHO ============================================================== ECHO DOS Update System - One-Time Deployment ECHO ============================================================== @@ -29,7 +34,6 @@ ECHO - STAGE.BAT (System file staging) ECHO - REBOOT.BAT (Apply updates on reboot) ECHO - CHECKUPD.BAT (Check for updates) ECHO. -ECHO Press any key to continue... PAUSE ECHO. @@ -66,7 +70,6 @@ ECHO NET USE T: \\D2TESTNAS\test /YES ECHO. ECHO Then run DEPLOY.BAT again. ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -103,7 +106,6 @@ ECHO - CHECKUPD.BAT ECHO. ECHO Contact system administrator. ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -140,7 +142,6 @@ ECHO. ECHO Machine name must match folder on T: drive. ECHO Example: If this is TS-4R, T:\TS-4R\ must exist ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -153,7 +154,6 @@ ECHO - T: drive is writable ECHO - Network connection is stable ECHO - Permissions to create directories ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -226,7 +226,6 @@ GOTO UPDATE_AUTOEXEC ECHO. ECHO [ERROR] Could not create C:\BAT directory ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -239,7 +238,6 @@ ECHO - T: drive is accessible ECHO - C: drive has free space ECHO - No file locks on C:\BAT\ ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -284,7 +282,6 @@ ECHO 2. Find line: SET MACHINE=... ECHO 3. Change to: SET MACHINE=%MACHINE% ECHO 4. Save and reboot ECHO. -ECHO Press any key to continue... PAUSE GOTO DEPLOYMENT_COMPLETE @@ -295,7 +292,6 @@ ECHO. ECHO You must manually add this line to C:\AUTOEXEC.BAT: ECHO SET MACHINE=%MACHINE% ECHO. -ECHO Press any key to continue... PAUSE GOTO DEPLOYMENT_COMPLETE @@ -348,7 +344,6 @@ ECHO Machine: %MACHINE% >> T:\%MACHINE%\DEPLOY.LOG ECHO Files installed to: C:\BAT\ >> T:\%MACHINE%\DEPLOY.LOG ECHO AUTOEXEC.BAT backup: C:\AUTOEXEC.SAV >> T:\%MACHINE%\DEPLOY.LOG -ECHO Press any key to exit... PAUSE GOTO END diff --git a/DOSTEST.BAT b/DOSTEST.BAT index d228bc4..ca609e4 100644 --- a/DOSTEST.BAT +++ b/DOSTEST.BAT @@ -24,7 +24,6 @@ GOTO TEST2 ECHO [FAIL] MACHINE variable not set ECHO Fix: Add "SET MACHINE=TS-4R" to C:\AUTOEXEC.BAT ECHO. -ECHO Press any key to continue testing... PAUSE GOTO TEST2 @@ -198,5 +197,4 @@ ECHO. :END ECHO ============================================================== ECHO. -ECHO Press any key to exit... PAUSE diff --git a/NWTOC.BAT b/NWTOC.BAT index 8311b23..cb5df4a 100644 --- a/NWTOC.BAT +++ b/NWTOC.BAT @@ -29,7 +29,6 @@ ECHO Then reboot or run: ECHO SET MACHINE=TS-4R ECHO NWTOC ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -63,7 +62,6 @@ ECHO. ECHO Or map manually: ECHO NET USE T: \\D2TESTNAS\test /YES ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -100,7 +98,6 @@ ECHO. ECHO Network share structure is incorrect. ECHO Expected: T:\COMMON\ProdSW\ ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -110,7 +107,6 @@ ECHO. ECHO Update directory is missing. ECHO Expected: T:\COMMON\ProdSW\*.bat ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -280,7 +276,6 @@ ECHO - Insufficient memory ECHO - Invalid path ECHO - Target drive not accessible ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -291,7 +286,6 @@ ECHO. ECHO Update may be incomplete! ECHO Run NWTOC again to complete update. ECHO. -ECHO Press any key to exit... PAUSE GOTO END diff --git a/REBOOT.BAT b/REBOOT.BAT index d552bcf..34ce4c8 100644 --- a/REBOOT.BAT +++ b/REBOOT.BAT @@ -43,7 +43,6 @@ ECHO. ECHO Backups will be saved as .SAV files. ECHO. ECHO Press Ctrl+C to cancel, or -ECHO Press any key to continue... PAUSE ECHO. @@ -119,7 +118,6 @@ ECHO Then reboot ECHO. ECHO ============================================================== ECHO. -ECHO Press any key to continue... PAUSE GOTO END @@ -137,7 +135,6 @@ ECHO. ECHO Run NWTOC to download updates from network, then: ECHO CALL C:\BAT\STAGE.BAT ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -157,7 +154,6 @@ ECHO 1. Boot from DOS floppy ECHO 2. Copy .SAV files back to .BAT and .SYS ECHO 3. Remove floppy and reboot ECHO. -ECHO Press any key to exit... PAUSE GOTO END diff --git a/STAGE.BAT b/STAGE.BAT index 2b553a9..91a8fb0 100644 --- a/STAGE.BAT +++ b/STAGE.BAT @@ -169,7 +169,6 @@ ECHO 4. Restore C:\AUTOEXEC.BAT from C:\AUTOEXEC.SAV ECHO. ECHO ============================================================== ECHO. -ECHO Press any key to return to DOS... PAUSE GOTO END @@ -187,7 +186,6 @@ ECHO C:\CONFIG.NEW (not found) ECHO. ECHO Run NWTOC to download updates from network. ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -197,7 +195,6 @@ ECHO [ERROR] C:\AUTOEXEC.BAT not found ECHO. ECHO Cannot stage updates without existing AUTOEXEC.BAT ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -211,7 +208,6 @@ ECHO Check: ECHO - Sufficient disk space on C: ECHO - C: drive is not write-protected ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -224,7 +220,6 @@ ECHO - C:\BAT directory exists ECHO - Sufficient disk space on C: ECHO - C: drive is not write-protected ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -237,7 +232,6 @@ ECHO. ECHO Recovery: ECHO COPY C:\AUTOEXEC.SAV C:\AUTOEXEC.BAT ECHO. -ECHO Press any key to exit... PAUSE GOTO END diff --git a/UPDATE.BAT b/UPDATE.BAT index 5915bf9..9dc3f92 100644 --- a/UPDATE.BAT +++ b/UPDATE.BAT @@ -26,7 +26,6 @@ ECHO. ECHO Or set MACHINE variable in AUTOEXEC.BAT: ECHO SET MACHINE=TS-4R ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -75,7 +74,6 @@ ECHO. ECHO Or map manually: ECHO NET USE T: \\D2TESTNAS\test /YES ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -156,7 +154,6 @@ ECHO - T: drive is writable ECHO - Sufficient disk space on T: ECHO - Network connection is stable ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -169,7 +166,6 @@ ECHO - Target drive is full ECHO - Network connection lost ECHO - Permission denied ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -182,7 +178,6 @@ ECHO - Insufficient memory ECHO - Invalid path ECHO - Target drive not accessible ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -192,7 +187,6 @@ ECHO [WARNING] Backup terminated by user (Ctrl+C) ECHO. ECHO Backup may be incomplete! ECHO. -ECHO Press any key to exit... PAUSE GOTO END @@ -204,7 +198,6 @@ ECHO This may indicate: ECHO - All files are already up to date (/D option) ECHO - Source drive is empty ECHO. -ECHO Press any key to exit... PAUSE GOTO END diff --git a/remove-pause-echo.ps1 b/remove-pause-echo.ps1 new file mode 100644 index 0000000..36b8951 --- /dev/null +++ b/remove-pause-echo.ps1 @@ -0,0 +1,46 @@ +# Remove redundant ECHO lines before PAUSE +# DOS 6.22 PAUSE already displays "Press any key to continue..." + +$BATFiles = Get-ChildItem *.BAT | Where-Object { + $_.Name -notlike "*_FROM_*" -and + $_.Name -notlike "*_TEST*" -and + $_.Name -notlike "*_VERIFY*" -and + $_.Name -notlike "*_CHECK*" -and + $_.Name -notlike "*_MONITOR*" +} + +Write-Host "[INFO] Removing redundant ECHO before PAUSE" -ForegroundColor Cyan +Write-Host "" + +$TotalRemoved = 0 + +foreach ($File in $BATFiles) { + Write-Host "Processing: $($File.Name)" -ForegroundColor White + + $Content = Get-Content $File.FullName -Raw + + # Remove "ECHO Press any key..." lines immediately before PAUSE + # Pattern: ECHO Press any key...\r?\n\s*PAUSE + $OriginalContent = $Content + + $Content = $Content -replace 'ECHO Press any key[^\r\n]*\r?\n(\s*)PAUSE', '$1PAUSE' + + if ($Content -ne $OriginalContent) { + $RemovedCount = ([regex]::Matches($OriginalContent, 'ECHO Press any key')).Count - ([regex]::Matches($Content, 'ECHO Press any key')).Count + Set-Content $File.FullName $Content -NoNewline + Write-Host " [OK] Removed $RemovedCount redundant ECHO lines" -ForegroundColor Green + $TotalRemoved += $RemovedCount + } else { + Write-Host " [OK] No redundant ECHO lines found" -ForegroundColor Green + } +} + +Write-Host "" +Write-Host "[SUCCESS] Removed $TotalRemoved redundant ECHO lines" -ForegroundColor Green +Write-Host "" +Write-Host "DOS 6.22 PAUSE displays:" -ForegroundColor Cyan +Write-Host " 'Press any key to continue . . .'" -ForegroundColor White +Write-Host "" +Write-Host "No need for ECHO before PAUSE unless:" -ForegroundColor Cyan +Write-Host " - Custom message needed (not 'Press any key...')" -ForegroundColor White +Write-Host ""