reorg and new download script

01_ExtractIso.cmd

@@ -2,9 +2,9 @@
 set T=c:\TEMP
 set W10=%T%\W10
 
-rem ===================
+echo ====================
-rem COMMANDLINE CHECKS
+echo Extract ISO file ...
-rem ===================
+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 =====

02_MakeAll.cmd

@@ -43,7 +43,7 @@ cd ..
 echo.
 date /t
 time /t
-echo =====
+echo ======
-echo END
+echo READY.
-echo =====
+echo ======
 

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 ======
+

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 =====
+echo ====================
-rem QUESTIONS
+echo Format USB Stick ...
-rem =====
+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

05_CreateStick.cmd

@@ -1,8 +1,9 @@
 @echo off
 
-rem ===================
+echo.
-rem COMMANDLINE CHECKS
+echo ====================
-rem ===================
+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% ...
 

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 ===================
+echo.
-rem COMMANDLINE CHECKS
+echo =====================
-rem ===================
+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.
 

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 ===================
+echo ===================
-rem COMMANDLINE CHECKS
+echo Make ISO file ...
-rem ===================
+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 =====

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