From c879f10d4beb712f4a091302f6fcc7a1031785fc Mon Sep 17 00:00:00 2001 From: "Michael H.G. Schmidt" Date: Thu, 29 Dec 2022 10:49:17 +0100 Subject: [PATCH] testing ... --- 03_MakeBoot.cmd | 8 +++---- 04_PrepareImage.cmd | 8 +++---- 05_FinishImage.cmd | 8 +++---- 06_FormatStick.cmd | 1 + 08_CopyWIM2Stick.cmd | 8 +++---- {wim => image}/.gitignore | 0 {boot => image}/CopyTools.cmd | 0 {boot => image}/CustomSetup.cmd | 10 ++++++--- {wim => image}/SetupComplete.cmd | 0 {wim => image}/StartCustomSetup.cmd | 0 {wim => image}/apps-to-remove.csv | 0 .../autounattend_BIOS_template.xml | 0 .../autounattend_UEFI_template.xml | 0 {wim => image}/export-image.cmd | 0 {wim => image}/finish-boot.cmd | 10 ++++----- {wim => image}/finish-image.cmd | 0 {wim => image}/get-wiminfo.cmd | 0 {wim => image}/installer.exe | Bin {wim => image}/mount-boot.cmd | 0 {wim => image}/mount-image.cmd | 0 {wim => image}/netuse.cmd | 0 {wim => image}/remove-apps.cmd | 0 {wim => image}/umount-all.cmd | 0 optional/install-teams.cmd | 1 + wim/RunScriptTest.cmd | 20 ------------------ 25 files changed, 30 insertions(+), 44 deletions(-) rename {wim => image}/.gitignore (100%) rename {boot => image}/CopyTools.cmd (100%) rename {boot => image}/CustomSetup.cmd (71%) rename {wim => image}/SetupComplete.cmd (100%) rename {wim => image}/StartCustomSetup.cmd (100%) rename {wim => image}/apps-to-remove.csv (100%) rename {boot => image}/autounattend_BIOS_template.xml (100%) rename {boot => image}/autounattend_UEFI_template.xml (100%) rename {wim => image}/export-image.cmd (100%) rename {wim => image}/finish-boot.cmd (74%) rename {wim => image}/finish-image.cmd (100%) rename {wim => image}/get-wiminfo.cmd (100%) rename {wim => image}/installer.exe (100%) rename {wim => image}/mount-boot.cmd (100%) rename {wim => image}/mount-image.cmd (100%) rename {wim => image}/netuse.cmd (100%) rename {wim => image}/remove-apps.cmd (100%) rename {wim => image}/umount-all.cmd (100%) delete mode 100644 wim/RunScriptTest.cmd diff --git a/03_MakeBoot.cmd b/03_MakeBoot.cmd index edba0b2..24a5062 100644 --- a/03_MakeBoot.cmd +++ b/03_MakeBoot.cmd @@ -1,12 +1,12 @@ @echo off -rem check for wim script directory ... -if NOT EXIST wim ( - echo ERROR: script directory [ wim ] NOT FOUND! +rem check for the image directory ... +if NOT EXIST image ( + echo ERROR: directory [ image ] NOT FOUND! echo ABORT. exit /b ) else ( - cd wim + cd image ) clear diff --git a/04_PrepareImage.cmd b/04_PrepareImage.cmd index ae279e8..8d96c5c 100644 --- a/04_PrepareImage.cmd +++ b/04_PrepareImage.cmd @@ -1,12 +1,12 @@ @echo off -rem check for wim script directory ... -if NOT EXIST wim ( - echo ERROR: script directory [ wim ] NOT FOUND! +rem check for the image directory ... +if NOT EXIST image ( + echo ERROR: directory [ image ] NOT FOUND! echo ABORT. exit /b ) else ( - cd wim + cd image ) clear diff --git a/05_FinishImage.cmd b/05_FinishImage.cmd index 9d5a761..776ddbb 100644 --- a/05_FinishImage.cmd +++ b/05_FinishImage.cmd @@ -1,12 +1,12 @@ @echo off -rem check for wim script directory ... -if NOT EXIST wim ( - echo ERROR: script directory [ wim ] NOT FOUND! +rem check for the image directory ... +if NOT EXIST image ( + echo ERROR: directory [ image ] NOT FOUND! echo ABORT. exit /b ) else ( - cd wim + cd image ) clear diff --git a/06_FormatStick.cmd b/06_FormatStick.cmd index 1bbdf78..4b8095c 100644 --- a/06_FormatStick.cmd +++ b/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. ) diff --git a/08_CopyWIM2Stick.cmd b/08_CopyWIM2Stick.cmd index a455492..3be4a1c 100644 --- a/08_CopyWIM2Stick.cmd +++ b/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. diff --git a/wim/.gitignore b/image/.gitignore similarity index 100% rename from wim/.gitignore rename to image/.gitignore diff --git a/boot/CopyTools.cmd b/image/CopyTools.cmd similarity index 100% rename from boot/CopyTools.cmd rename to image/CopyTools.cmd diff --git a/boot/CustomSetup.cmd b/image/CustomSetup.cmd similarity index 71% rename from boot/CustomSetup.cmd rename to image/CustomSetup.cmd index d6299a4..229b5bf 100644 --- a/boot/CustomSetup.cmd +++ b/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% ... -rd /S /Q %TOOLS% %SXS% -echo. +rem echo deleting %TOOLS% and %SXS% ... +rem rd /S /Q %TOOLS% %SXS% +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 diff --git a/wim/SetupComplete.cmd b/image/SetupComplete.cmd similarity index 100% rename from wim/SetupComplete.cmd rename to image/SetupComplete.cmd diff --git a/wim/StartCustomSetup.cmd b/image/StartCustomSetup.cmd similarity index 100% rename from wim/StartCustomSetup.cmd rename to image/StartCustomSetup.cmd diff --git a/wim/apps-to-remove.csv b/image/apps-to-remove.csv similarity index 100% rename from wim/apps-to-remove.csv rename to image/apps-to-remove.csv diff --git a/boot/autounattend_BIOS_template.xml b/image/autounattend_BIOS_template.xml similarity index 100% rename from boot/autounattend_BIOS_template.xml rename to image/autounattend_BIOS_template.xml diff --git a/boot/autounattend_UEFI_template.xml b/image/autounattend_UEFI_template.xml similarity index 100% rename from boot/autounattend_UEFI_template.xml rename to image/autounattend_UEFI_template.xml diff --git a/wim/export-image.cmd b/image/export-image.cmd similarity index 100% rename from wim/export-image.cmd rename to image/export-image.cmd diff --git a/wim/finish-boot.cmd b/image/finish-boot.cmd similarity index 74% rename from wim/finish-boot.cmd rename to image/finish-boot.cmd index 93ca410..3df1b2a 100644 --- a/wim/finish-boot.cmd +++ b/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 ... diff --git a/wim/finish-image.cmd b/image/finish-image.cmd similarity index 100% rename from wim/finish-image.cmd rename to image/finish-image.cmd diff --git a/wim/get-wiminfo.cmd b/image/get-wiminfo.cmd similarity index 100% rename from wim/get-wiminfo.cmd rename to image/get-wiminfo.cmd diff --git a/wim/installer.exe b/image/installer.exe similarity index 100% rename from wim/installer.exe rename to image/installer.exe diff --git a/wim/mount-boot.cmd b/image/mount-boot.cmd similarity index 100% rename from wim/mount-boot.cmd rename to image/mount-boot.cmd diff --git a/wim/mount-image.cmd b/image/mount-image.cmd similarity index 100% rename from wim/mount-image.cmd rename to image/mount-image.cmd diff --git a/wim/netuse.cmd b/image/netuse.cmd similarity index 100% rename from wim/netuse.cmd rename to image/netuse.cmd diff --git a/wim/remove-apps.cmd b/image/remove-apps.cmd similarity index 100% rename from wim/remove-apps.cmd rename to image/remove-apps.cmd diff --git a/wim/umount-all.cmd b/image/umount-all.cmd similarity index 100% rename from wim/umount-all.cmd rename to image/umount-all.cmd diff --git a/optional/install-teams.cmd b/optional/install-teams.cmd index 13d73aa..c774573 100644 --- a/optional/install-teams.cmd +++ b/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" diff --git a/wim/RunScriptTest.cmd b/wim/RunScriptTest.cmd deleted file mode 100644 index c1dc93c..0000000 --- a/wim/RunScriptTest.cmd +++ /dev/null @@ -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 -