simplification

04_PrepareImage.cmd

@@ -1,4 +1,7 @@
 @echo off
+set ARG1=null
+IF "%~1" NEQ "" set ARG1=%1
+if /I %ARG1% == /? goto usage
 
 rem check for the image directory ...
 if NOT EXIST image (
@@ -9,25 +12,32 @@ if NOT EXIST image (
   cd image
 )
 
-echo ===================================
+echo =========================================
-echo START of MAIN image preparation ... 
+echo START of MAIN image creation process ... 
-echo ===================================
+echo =========================================
 echo.
 
 rem start scripts
 for %%S in (
-
   export-image.cmd
   mount-image.cmd
-
 ) do (
-
   echo ########## calling [ %%S ] ##########
   call %%S
   echo.
-
 )
 
+
+if /I %ARG1% == /R (
+  echo ########## calling [ remove-apps.cmd ] ##########
+  call remove-apps.cmd
+  echo.
+)
+
+echo ########## calling [ finish-image.cmd ] ##########
+call finish-image.cmd
+echo.
+
 echo checking for NTLite ...
 if NOT EXIST %NTLITE% (
   echo.
@@ -45,4 +55,11 @@ echo.
 echo ======
 echo READY.
 echo ======
+GOTO END
 
+:USAGE
+echo "usage: %0 [/R|/?]"
+echo "  /R = remove apps from main image"
+echo "  /? = show help                  "
+echo.
+:END

05_FinishImage.cmd

@@ -1,39 +0,0 @@
-@echo off
-
-rem check for the image directory ...
-if NOT EXIST image (
-  echo ERROR: directory [ image ] NOT FOUND!
-  echo ABORT.
-  exit /b
-) else (
-  cd image
-)
-
-echo =================================
-echo END of MAIN image preparation ... 
-echo =================================
-echo.
-
-rem start scripts
-for %%S in (
-
-  mount-image.cmd
-  remove-apps.cmd
-  finish-image.cmd
-
-) do (
-
-  echo ########## calling [ %%S ] ##########
-  call %%S
-  echo.
-
-)
-
-rem go back ...
-cd ..
-
-echo.
-echo ======
-echo READY.
-echo ======
-

README.md

@@ -435,7 +435,7 @@ Many things will be done here:
 Execute:
 ```dos
 cd /D %USERPROFILE%\workspace\git\w10install
-03_MakeBoot.cmd
+03_PrepareBoot.cmd
 
 ```
 This will create the new "boot.wim" image.
@@ -451,6 +451,14 @@ cd /D %USERPROFILE%\workspace\git\w10install
 ```
 This will create/prepare the new "install.wim" image.
 
+This script can also remove almost all APSS in the image (that are listed in the file "image\apps-to-remove.csv"). To do this call it with the switch "/R":
+
+Execute:
+```dos
+04_PrepareImage.cmd /R
+
+```
+
 
 ## 8.3 Edit the Windows image with "NTLite"
 
@@ -461,17 +469,6 @@ In case you have installed "NTLite" the script "04_PrepareImage.cmd" will start
 *SUGGESTION: Before modifying your windows image (and maybe screwing up everything) go through the whole process and test your boot media with a standard image.*
 
 
-## 8.4 Finalize the images
-
-Execute:
-```dos
-cd /D %USERPROFILE%\workspace\git\w10install
-05_FinishImage.cmd
-
-```
-This script will finish the images and it will also remove all Apps listed in the file "image\apps-to-remove.csv".
-
-
 # 9. Finally create a new boot media
 
 This has to be done in 3 steps:
@@ -487,7 +484,7 @@ Please use a fast USB 3 stick. The size should be 16 GB or more (you could use 8
 To create it execute:
 ```dos
 cd /D %USERPROFILE%\workspace\git\w10install
-06_FormatStick.cmd
+05_FormatStick.cmd
 
 ```
 
@@ -568,7 +565,7 @@ Now it's time to copy the custom windows images, all scripts and additional 3rd
 Execute:
 ```dos
 cd /D %USERPROFILE%\workspace\git\w10install
-07_Copy2Stick.cmd E:
+06_Copy2Stick.cmd E:
 
 ```
 
@@ -694,7 +691,7 @@ In case you need an ISO image you can create it with the following command:
 
 ```dos
 cd /D %USERPROFILE%\workspace\git\w10install
-08_MakeISOfromStick.cm E:
+07_MakeISOfromStick.cm E:
 
 ```
 

image/finish-boot.cmd

@@ -33,9 +33,6 @@ if EXIST ..\company\snapshot64.exe (
 echo copy netuse helper script to boot image ...
 copy /Y netuse.cmd %BOOT%
 
-echo showing boot image contents ...
-dir %BOOT%
-
 echo unmounting and committing changes to %SOURCES%\boot.wim ...
 dism /Unmount-Wim /MountDir:%BOOT% /Commit
 

image/finish-image.cmd

@@ -22,9 +22,6 @@ if %ERRORLEVEL% NEQ 0 (
   exit /b
 )
 
-echo [%0] INFO: showing directory contents :
-dir %IMAGE%\Windows\Setup\scripts %IMAGE%\Windows\prompt-user.exe
-
 echo [%0] INFO: doing cleanup on mountpoint %IMAGE% ...
 dism /Image:%IMAGE% /Cleanup-Image /StartComponentCleanup /ResetBase
 

image/remove-apps.cmd

@@ -4,7 +4,7 @@ set IMAGE=c:\TEMP\IMAGE
 FOR /F %%P in (apps-to-remove.csv) do (
 
   echo removing APPX package [ Microsoft.%%P ]
-  dism /Image:%IMAGE% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.%%P
+  dism /Image:%IMAGE% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.%%P 1>nul 2>&1
 
 )