From 60b84fd9168d72d07609b67e47a0aa7e11776321 Mon Sep 17 00:00:00 2001
From: "Michael H.G. Schmidt" <michael@schmidt2.de>
Date: Mon, 21 Dec 2020 16:40:22 +0100
Subject: [PATCH] .

---
 Copy2Wim.cmd                | 2 +-
 RunTest.cmd                 | 2 +-
 SetupComplete.cmd           | 2 +-
 wimscripts/copy-iso.cmd     | 3 ++-
 wimscripts/download-iso.cmd | 3 ++-
 wimscripts/export-image.cmd | 5 +++--
 wimscripts/finish-image.cmd | 5 +++--
 wimscripts/get-wiminfo.cmd  | 2 +-
 wimscripts/mount-wim.cmd    | 2 +-
 wimscripts/umount-wim.cmd   | 1 +
 10 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Copy2Wim.cmd b/Copy2Wim.cmd
index b25f7b4..5564945 100644
--- a/Copy2Wim.cmd
+++ b/Copy2Wim.cmd
@@ -1,4 +1,4 @@
-echo off
+@echo off
 set MNT="c:\TEMP\WIM"
 
 echo ####### Copy2Wim.cmd #######
diff --git a/RunTest.cmd b/RunTest.cmd
index 73d73d6..b38146e 100644
--- a/RunTest.cmd
+++ b/RunTest.cmd
@@ -1,4 +1,4 @@
-echo off
+@echo off
 
 echo ####### RunTest.cmd #######
 
diff --git a/SetupComplete.cmd b/SetupComplete.cmd
index e80a209..6b90f5b 100644
--- a/SetupComplete.cmd
+++ b/SetupComplete.cmd
@@ -1,4 +1,4 @@
-echo off
+@echo off
 set T="c:\TEMP"
 set TOOLS="c:\tools"
 set SCRIPTS="c:\scripts"
diff --git a/wimscripts/copy-iso.cmd b/wimscripts/copy-iso.cmd
index dbe086e..4ebffe7 100644
--- a/wimscripts/copy-iso.cmd
+++ b/wimscripts/copy-iso.cmd
@@ -1,6 +1,7 @@
+@echo off
 set W10="c:\TEMP\Win10"
 
-rd /S /Q %W10%
+rd /S /Q %W10% 1>nul 2>nul
 mkdir %W10% 1>nul 2>nul
 
 powershell Mount-DiskImage -ImagePath %W10%.iso
diff --git a/wimscripts/download-iso.cmd b/wimscripts/download-iso.cmd
index c2f675b..7e7f797 100644
--- a/wimscripts/download-iso.cmd
+++ b/wimscripts/download-iso.cmd
@@ -1,9 +1,10 @@
+@echo off
 mkdir c:\TEMP 1>nul 2>nul
 
 set ISOGLOB=c:\TEMP\Win10*.iso
 set ISO=c:\TEMP\Win10.iso
 
-del %ISOGLOB%
+del %ISOGLOB% 1>nul 2>nul
 ftp -i -s:download-iso.ftp
 move %ISOGLOB% %ISO%
 
diff --git a/wimscripts/export-image.cmd b/wimscripts/export-image.cmd
index 3a7d6f4..3357ad2 100644
--- a/wimscripts/export-image.cmd
+++ b/wimscripts/export-image.cmd
@@ -1,11 +1,12 @@
+@echo off
 set SOURCES=c:\TEMP\Win10\sources
 
-del %SOURCES%\install.wim
+del %SOURCES%\install.wim 1>null 2>nul
 
 dism /Export-Image ^
   /SourceImageFile:%SOURCES%\install.esd ^
   /DestinationImageFile:%SOURCES%\install.wim ^
-  /SourceIndex:6 ^
+  /SourceName:"Windows 10 Pro" ^
   /Compress:Max ^
   /CheckIntegrity
 
diff --git a/wimscripts/finish-image.cmd b/wimscripts/finish-image.cmd
index 408285b..3e17b44 100644
--- a/wimscripts/finish-image.cmd
+++ b/wimscripts/finish-image.cmd
@@ -1,3 +1,4 @@
+@echo off
 set SOURCES=c:\TEMP\Win10\sources
 set MNT=c:\TEMP\WIM
 
@@ -5,9 +6,9 @@ rem dism /Image:%MNT% /Cleanup-Image /StartComponentCleanup /ResetBase
 rem dism /Unmount-Wim /MountDir:%MNT% /Commit
 
 dism /Export-Image ^
-  /SourceImageFile:%SOURCES%\install_FINAL.wim ^
+  /SourceImageFile:%SOURCES%\install.wim ^
   /DestinationImageFile:%SOURCES%\install_FINAL.esd ^
-  /SourceIndex:1 ^
+  /SourceName:"Windows 10 Pro" ^
   /Compress:Recovery ^
   /CheckIntegrity
 
diff --git a/wimscripts/get-wiminfo.cmd b/wimscripts/get-wiminfo.cmd
index b434b3c..0f14221 100644
--- a/wimscripts/get-wiminfo.cmd
+++ b/wimscripts/get-wiminfo.cmd
@@ -1,4 +1,4 @@
-echo off
+@echo off
 set SOURCES=c:\TEMP\Win10\sources
 set FILENAME=%1
 
diff --git a/wimscripts/mount-wim.cmd b/wimscripts/mount-wim.cmd
index 7e708d8..d6cc830 100644
--- a/wimscripts/mount-wim.cmd
+++ b/wimscripts/mount-wim.cmd
@@ -2,5 +2,5 @@ set SOURCES="c:\TEMP\Win10\sources"
 set MNT="c:\TEMP\WIM"
 
 mkdir %MNT%
-dism /Mount-Wim /WimFile:%SOURCES%\install.wim /Name:"Windows 10 Pro N" /MountDir:%MNT%
+dism /Mount-Wim /WimFile:%SOURCES%\install.wim /Name:"Windows 10 Pro" /MountDir:%MNT%
 
diff --git a/wimscripts/umount-wim.cmd b/wimscripts/umount-wim.cmd
index 91c2f1e..d49426c 100644
--- a/wimscripts/umount-wim.cmd
+++ b/wimscripts/umount-wim.cmd
@@ -1,3 +1,4 @@
+@echo off
 set SOURCES="c:\TEMP\Win10\sources"
 set MNT="c:\TEMP\WIM"