From b2d06a7539a598062df2d55368749e36689c3769 Mon Sep 17 00:00:00 2001 From: "Michael H.G. Schmidt" Date: Wed, 17 Mar 2021 00:22:50 +0100 Subject: [PATCH] reorg and new download script --- 01_ExtractIso.cmd | 9 +++-- 02_MakeAll.cmd | 6 +-- 03_DownloadAll.cmd | 44 ++++++++++++++++++++++ 03_FormatStick.cmd => 04_FormatStick.cmd | 13 +++---- 04_CreateStick.cmd => 05_CreateStick.cmd | 9 ++--- 05_PrepareStick.cmd => 06_PrepareStick.cmd | 14 +++---- 06_MakeIso.cmd => 07_MakeIso.cmd | 14 ++++--- software/other.csv | 2 +- 8 files changed, 80 insertions(+), 31 deletions(-) create mode 100644 03_DownloadAll.cmd rename 03_FormatStick.cmd => 04_FormatStick.cmd (87%) rename 04_CreateStick.cmd => 05_CreateStick.cmd (83%) rename 05_PrepareStick.cmd => 06_PrepareStick.cmd (84%) rename 06_MakeIso.cmd => 07_MakeIso.cmd (77%) diff --git a/01_ExtractIso.cmd b/01_ExtractIso.cmd index fa7abe4..5dfa2f6 100644 --- a/01_ExtractIso.cmd +++ b/01_ExtractIso.cmd @@ -2,9 +2,9 @@ set T=c:\TEMP set W10=%T%\W10 -rem =================== -rem COMMANDLINE CHECKS -rem =================== +echo ==================== +echo Extract ISO file ... +echo ==================== IF %1.==. GOTO USAGE @@ -34,6 +34,9 @@ robocopy \\.\CDROM0 %W10% /MIR /256 /NFL /NDL echo unmounting disk image (iso) ... powershell Dismount-Diskimage -ImagePath %ISOFILE% +echo READY. +echo. + rem ===== rem END rem ===== diff --git a/02_MakeAll.cmd b/02_MakeAll.cmd index c03a3c2..550a4f9 100644 --- a/02_MakeAll.cmd +++ b/02_MakeAll.cmd @@ -43,7 +43,7 @@ cd .. echo. date /t time /t -echo ===== -echo END -echo ===== +echo ====== +echo READY. +echo ====== diff --git a/03_DownloadAll.cmd b/03_DownloadAll.cmd new file mode 100644 index 0000000..6397348 --- /dev/null +++ b/03_DownloadAll.cmd @@ -0,0 +1,44 @@ +@echo off + +rem check for software directory ... +if NOT EXIST software ( + echo ERROR: directory [ software ] NOT FOUND! + echo ABORT. + exit /b +) else ( + cd software +) + +clear +echo ================================================ +echo START download of software from SOURCE sites ... +echo ================================================ +date /t +time /t +echo. + +rem start downloads ... +for %%D in ( + + basic + browser + optional + +) do ( + + echo ########## [ %%D ] SOFTWARE ########## + call download-from-source.cmd %%D + echo. + +) + +rem go back ... +cd .. + +echo. +date /t +time /t +echo ====== +echo READY. +echo ====== + diff --git a/03_FormatStick.cmd b/04_FormatStick.cmd similarity index 87% rename from 03_FormatStick.cmd rename to 04_FormatStick.cmd index 594b2dc..c2ace5c 100644 --- a/03_FormatStick.cmd +++ b/04_FormatStick.cmd @@ -2,16 +2,13 @@ set T=c:\TEMP set DPARTSCRIPT=%T%\diskpart.txt -echo. -echo ########################################## - rem create temp directory and cleanup ... mkdir %T% 1>nul 2>nul del /Y %DPARTSCRIPT% 1>nul 2>nul -rem ===== -rem QUESTIONS -rem ===== +echo ==================== +echo Format USB Stick ... +echo ==================== echo. echo Showing disk list ... @@ -82,7 +79,9 @@ if %errorlevel% NEQ 0 ( echo ERROR: while formatting the disk! exit /b ) -echo READY. USB stick formatted. +echo READY. +echo USB stick formatted. +echo. rem ===== rem END diff --git a/04_CreateStick.cmd b/05_CreateStick.cmd similarity index 83% rename from 04_CreateStick.cmd rename to 05_CreateStick.cmd index acbe1fb..c9db839 100644 --- a/04_CreateStick.cmd +++ b/05_CreateStick.cmd @@ -1,8 +1,9 @@ @echo off -rem =================== -rem COMMANDLINE CHECKS -rem =================== +echo. +echo ==================== +echo Create USB Stick ... +echo ==================== IF %1.==. GOTO USAGE IF %2.==. GOTO USAGE @@ -30,8 +31,6 @@ rem ===== rem MAIN rem ===== -echo. -echo ########################################## echo using drive %USBDRIVE% ... echo using image %ISOFILE% ... diff --git a/05_PrepareStick.cmd b/06_PrepareStick.cmd similarity index 84% rename from 05_PrepareStick.cmd rename to 06_PrepareStick.cmd index b9c87ae..3ff5565 100644 --- a/05_PrepareStick.cmd +++ b/06_PrepareStick.cmd @@ -3,9 +3,10 @@ set SOURCES=c:\TEMP\W10\sources set IMAGE=install_FINAL.esd set ALTIMAGE=install_FINAL_lastrun.esd -rem =================== -rem COMMANDLINE CHECKS -rem =================== +echo. +echo ===================== +echo Prepare USB Stick ... +echo ===================== IF %1.==. GOTO USAGE @@ -21,8 +22,6 @@ if NOT EXIST %USBDRIVE% ( exit /b ) -echo. -echo ########################################## echo using drive %USBDRIVE% ... rem ===== @@ -74,14 +73,14 @@ if EXIST %SOURCES%\%IMAGE% ( :CONT echo. if EXIST tools ( - echo copying folder tools to drive %USBDRIVE% ... + echo copying folder [ tools ] to drive %USBDRIVE% ... robocopy tools %USBDRIVE%\tools /COPY:DT /FFT /XO /256 /NJH /NJS /NDL /XF .gitignore ) for %%P in (software scripts source optional personal) do ( if EXIST %%P ( echo. - echo copying folder %%P to drive %USBDRIVE%\tools ... + echo copying folder [ %%P ] to %USBDRIVE%\tools ... robocopy %%P %USBDRIVE%\tools\%%P /COPY:DT /FFT /XO /MIR /256 /NJH /NJS /NDL /XF .gitignore /XD .git ) ) @@ -89,6 +88,7 @@ for %%P in (software scripts source optional personal) do ( echo. echo copying custom setup script to %USBDRIVE% ... copy /Y boot\CustomSetup.cmd %USBDRIVE%\ + echo READY. echo. diff --git a/06_MakeIso.cmd b/07_MakeIso.cmd similarity index 77% rename from 06_MakeIso.cmd rename to 07_MakeIso.cmd index 151da1f..b1f5b9d 100644 --- a/06_MakeIso.cmd +++ b/07_MakeIso.cmd @@ -3,9 +3,10 @@ set OSCDPATH="%ProgramFiles(x86)%\Windows Kits\10\Assessment and Deployment Kit\ set OSLABEL=WIN10-AUTO set ISOFILE=c:\temp\%OSLABEL%.iso -rem =================== -rem COMMANDLINE CHECKS -rem =================== +echo =================== +echo Make ISO file ... +echo =================== +echo. IF %1.==. GOTO USAGE set USBDRIVE=%1 @@ -15,7 +16,7 @@ if /I %USBDRIVE% == C: ( exit /b ) -echo using drive %USBDRIVE% ... +echo using drive [ %USBDRIVE% ] ... if NOT EXIST %USBDRIVE% ( echo ERROR: drive %USBDRIVE% not found! @@ -26,7 +27,7 @@ rem ===== rem MAIN rem ===== -del /F %ISOFILE% +del /F %ISOFILE% 2>nul if EXIST %ISOFILE% ( echo ERROR: cannot delete/create %ISOFILE%! @@ -36,6 +37,9 @@ if EXIST %ISOFILE% ( %OSCDPATH%\oscdimg -l%OSLABEL% -m -u2 -b%OSCDPATH%\etfsboot.com %USBDRIVE% %ISOFILE% +echo READY. +echo. + rem ===== rem END rem ===== diff --git a/software/other.csv b/software/other.csv index 874e99c..3df1396 100644 --- a/software/other.csv +++ b/software/other.csv @@ -3,5 +3,5 @@ dummy xojo-setup.exe dummy pl2303-setup.exe dummy wfc5210-setup.exe dummy cyberjack-setup.exe -dummy jre64-setup.exe +dummy java-setup.exe