From acc559ce6bf5f01741fa9944965e7b2e2134a090 Mon Sep 17 00:00:00 2001
From: "Michael H.G. Schmidt" <michael@schmidt2.de>
Date: Wed, 23 Dec 2020 16:44:26 +0100
Subject: [PATCH] .

---
 1st-logon.cmd                                     | 9 +++------
 ToolsDownload.ftp                                 | 5 +++++
 SetupComplete.cmd => wimscripts/SetupComplete.cmd | 0
 wimscripts/copy-iso.cmd                           | 2 +-
 wimscripts/mount-wim.cmd                          | 6 ++++--
 wimscripts/remove-components.cmd                  | 4 ++--
 wimscripts/umount-wim.cmd                         | 4 ++--
 7 files changed, 17 insertions(+), 13 deletions(-)
 rename SetupComplete.cmd => wimscripts/SetupComplete.cmd (100%)

diff --git a/1st-logon.cmd b/1st-logon.cmd
index ea91afe..22de21c 100644
--- a/1st-logon.cmd
+++ b/1st-logon.cmd
@@ -1,10 +1,7 @@
 @echo off
-set T="c:\TEMP"
-set TOOLS="c:\tools"
-set SCRIPTS="c:\scripts"
-
-echo "Ready to start configuring this workstation ?"
-timeout /t -1
+set T=c:\TEMP
+set TOOLS=c:\tools
+set SCRIPTS=c:\scripts
 
 echo ####### 1st-logon.cmd #######
 
diff --git a/ToolsDownload.ftp b/ToolsDownload.ftp
index b556c76..384d70b 100644
--- a/ToolsDownload.ftp
+++ b/ToolsDownload.ftp
@@ -17,6 +17,11 @@ lcd c:\scripts\conf
 mget *
 cd ..
 
+cd other
+lcd c:\scripts\other
+mget *
+cd ..
+
 cd desktop
 lcd c:\scripts\desktop
 mget *
diff --git a/SetupComplete.cmd b/wimscripts/SetupComplete.cmd
similarity index 100%
rename from SetupComplete.cmd
rename to wimscripts/SetupComplete.cmd
diff --git a/wimscripts/copy-iso.cmd b/wimscripts/copy-iso.cmd
index 1576aaf..17746dc 100644
--- a/wimscripts/copy-iso.cmd
+++ b/wimscripts/copy-iso.cmd
@@ -1,4 +1,4 @@
-set W10="c:\TEMP\Win10"
+set W10=c:\TEMP\Win10
 
 rd /S /Q %W10% 1>nul 2>nul
 mkdir %W10% 1>nul 2>nul
diff --git a/wimscripts/mount-wim.cmd b/wimscripts/mount-wim.cmd
index d6cc830..0f9ef2e 100644
--- a/wimscripts/mount-wim.cmd
+++ b/wimscripts/mount-wim.cmd
@@ -1,6 +1,8 @@
-set SOURCES="c:\TEMP\Win10\sources"
-set MNT="c:\TEMP\WIM"
+set SOURCES=c:\TEMP\Win10\sources
+set MNT=c:\TEMP\WIM
 
 mkdir %MNT%
 dism /Mount-Wim /WimFile:%SOURCES%\install.wim /Name:"Windows 10 Pro" /MountDir:%MNT%
 
+del null 1>nul 2>nul
+
diff --git a/wimscripts/remove-components.cmd b/wimscripts/remove-components.cmd
index 2517c86..628e4bb 100644
--- a/wimscripts/remove-components.cmd
+++ b/wimscripts/remove-components.cmd
@@ -1,4 +1,4 @@
-set MNT="c:\TEMP\WIM"
+set MNT=c:\TEMP\WIM
 
 rem GROUP 1:
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Internet" /r
@@ -10,7 +10,7 @@ install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-RetailDemo" /r
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-ContactSupport" /r
 install_wim_tweak.exe /p %MNT% /c "Microsoft-PPIProjection" /r
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Backup" /r
-install_wim_tweak.exe /p %MNT% /c "Windows-Defender" /r
+rem install_wim_tweak.exe /p %MNT% /c "Windows-Defender" /r
 
 rem GROUP 2:
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Xbox" /r
diff --git a/wimscripts/umount-wim.cmd b/wimscripts/umount-wim.cmd
index 91c2f1e..bbf6898 100644
--- a/wimscripts/umount-wim.cmd
+++ b/wimscripts/umount-wim.cmd
@@ -1,5 +1,5 @@
-set SOURCES="c:\TEMP\Win10\sources"
-set MNT="c:\TEMP\WIM"
+set SOURCES=c:\TEMP\Win10\sources
+set MNT=c:\TEMP\WIM
 
 dism /Unmount-Wim /MountDir:%MNT% /Discard
 dism /Cleanup-Wim