testing ...

03_MakeBoot.cmd

@@ -1,12 +1,12 @@
 @echo off
 
-rem check for wim script directory ...
+rem check for the image directory ...
-if NOT EXIST wim (
+if NOT EXIST image (
-  echo ERROR: script directory [ wim ] NOT FOUND!
+  echo ERROR: directory [ image ] NOT FOUND!
   echo ABORT.
   exit /b
 ) else (
-  cd wim
+  cd image
 )
 
 clear

04_PrepareImage.cmd

@@ -1,12 +1,12 @@
 @echo off
 
-rem check for wim script directory ...
+rem check for the image directory ...
-if NOT EXIST wim (
+if NOT EXIST image (
-  echo ERROR: script directory [ wim ] NOT FOUND!
+  echo ERROR: directory [ image ] NOT FOUND!
   echo ABORT.
   exit /b
 ) else (
-  cd wim
+  cd image
 )
 
 clear

05_FinishImage.cmd

@@ -1,12 +1,12 @@
 @echo off
 
-rem check for wim script directory ...
+rem check for the image directory ...
-if NOT EXIST wim (
+if NOT EXIST image (
-  echo ERROR: script directory [ wim ] NOT FOUND!
+  echo ERROR: directory [ image ] NOT FOUND!
   echo ABORT.
   exit /b
 ) else (
-  cd wim
+  cd image
 )
 
 clear

06_FormatStick.cmd

@@ -111,6 +111,7 @@ rem =====
   @echo.select partition 1
   @echo.format fs="%FS%" LABEL="%LABEL%" quick
   @echo.active
+  @echo.assign
   @echo.exit
   @echo.
 )

08_CopyWIM2Stick.cmd

@@ -59,12 +59,12 @@ set answer=
   set /p answer="BIOS or UEFI setup (B/U)? "
   if /i "%answer:~,1%" EQU "B" (
     echo selected: BIOS
-    copy /Y boot\autounattend_BIOS_template.xml %USBDRIVE%\autounattend.xml
+    copy /Y image\autounattend_BIOS_template.xml %USBDRIVE%\autounattend.xml
     GOTO CONT
   )
   if /i "%answer:~,1%" EQU "U" (
     echo selected: UEFI
-    copy /Y boot\autounattend_UEFI_template.xml %USBDRIVE%\autounattend.xml
+    copy /Y image\autounattend_UEFI_template.xml %USBDRIVE%\autounattend.xml
     GOTO CONT
   )
   echo Please type B for BIOS or U for UEFI setup.
@@ -155,11 +155,11 @@ if EXIST %SCRIPT_SETTINGS% (
 
 echo.
 echo copying custom setup script to %USBDRIVE% ...
-copy /Y boot\CustomSetup.cmd %USBDRIVE%\
+copy /Y image\CustomSetup.cmd %USBDRIVE%\
 
 echo.
 echo putting tools-copy script to %USBDRIVE% ...
-copy /Y boot\CopyTools.cmd %USBDRIVE%\
+copy /Y image\CopyTools.cmd %USBDRIVE%\
 
 echo READY.
 echo.

image/CustomSetup.cmd

@@ -23,9 +23,13 @@ rem echo restart explorer ...
 rem taskkill /F /IM explorer.exe & start explorer.exe
 rem echo.
 
-echo deleting %TOOLS% and %SXS% ...
+rem echo deleting %TOOLS% and %SXS% ...
-rd /S /Q %TOOLS% %SXS%
+rem rd /S /Q %TOOLS% %SXS%
-echo.
+rem echo.
+
+rem WARNING: DO NOT KILL windows explorer here!
+rem   Explanation: Doing this will result in a crippled
+rem   Windows defender configuration! (App to open it will not be present)
 
 echo copying folder %TOOLS% ...
 robocopy tools %TOOLS% /MIR /256 /NJH /NFL /NDL

image/finish-boot.cmd

@@ -10,28 +10,28 @@ if EXIST ..\settings.cmd (
 echo LANG=%LANG%
 
 if NOT EXIST %BOOT%\winsetup.exe (
-  echo renaming Windows setup.exe to boot ...
+  echo renaming Windows setup.exe to boot image ...
   move /Y %BOOT%\setup.exe %BOOT%\winsetup.exe
 )
 
-echo setting language in boot ...
+echo setting language in boot image ...
 dism /image:%BOOT% /Set-InputLocale:%LANG%
 dism /image:%BOOT% /Set-SysLocale:%LANG%
 
 echo replacing setup.exe with our installer utility ...
 copy /Y installer.exe %BOOT%\setup.exe
 
-echo copy snapshot64 to boot ...
+echo copy snapshot64 to boot image ...
 if EXIST ..\personal\snapshot64.exe (
   copy /Y ..\personal\snapshot64.exe %BOOT%
 ) else (
   copy /Y ..\software\snapshot64.exe %BOOT%
 )
 
-echo copy netuse helper script to boot ...
+echo copy netuse helper script to boot image ...
 copy /Y netuse.cmd %BOOT%
 
-echo showing boot contents ...
+echo showing boot image contents ...
 dir %BOOT%
 
 echo unmounting and committing changes to %SOURCES%\boot.wim ...

optional/install-teams.cmd

@@ -11,6 +11,7 @@ echo ####### %0 #######
 
 echo killing Teams process ...
 taskkill /F /IM teams.exe 2>nul
+timeout /nobreak 3
 
 echo cleaning cache ...
 deltree "%USERPROFILE%\AppData\Roaming\Microsoft\Teams"

wim/RunScriptTest.cmd

@@ -1,20 +0,0 @@
-@echo off
-set SCRIPTS=%WINDIR%\Setup\scripts
-set LOG1=C:\SetupComplete.txt
-set LOG2=C:\StartCustomSetup.txt
-
-rem prepare ...
-mkdir %SCRIPTS% 1>nul 2>nul
-del /F %LOG1% 1>nul 2>nul
-del /F %LOG2% 1>nul 2>nul
-
-echo ####### %0 #######
-
-copy /Y SetupComplete.cmd %SCRIPTS%
-copy /Y StartCustomSetup.cmd %SCRIPTS%
-
-echo ####### %0 #######
-
-call %SCRIPTS%\SetupComplete.cmd
-call %SCRIPTS%\StartCustomSetup.cmd
-