win10-prep

commit 004961c0a812dca3bb4327e5970845b138994db4
parent 06ca1b2a3d7f98b1a147d7d11a0585bcd00f538b
Author: breadcat <peter@minskio.co.uk>
Date:   Sun,  5 Jul 2020 18:17:57 +0100

Tidied unused local server sections

No longer use local server, so removed sections relating to it, also
removed activation as no longer running that server

Diffstat:
M
0-win10prep.bat
 | 
19
+++++--------------
D
1-activation.bat
 | 
7
-------
R
2-tweaks.bat -> 1-tweaks.bat
 | 
0

R
3-registry.bat -> 2-registry.bat
 | 
0

R
4-remove.bat -> 3-remove.bat
 | 
0

R
5-install.bat -> 4-install.bat
 | 
0

R
8-clean.bat -> 5-clean.bat
 | 
0

D
6-network.bat
 | 
13
-------------
D
7-updates.bat
 | 
4
----

9 files changed, 5 insertions(+), 38 deletions(-)
diff --git a/0-win10prep.bat b/0-win10prep.bat
@@ -25,29 +25,20 @@ if %errorLevel% == 0 (
 )
 
 rem Process
-<NUL set /p=:: Activating Windows... 
-call "1-activation.bat" > nul
-echo done
 <NUL set /p=:: System Tweaks... 
-call "2-tweaks.bat" > nul
+call "1-tweaks.bat" > nul
 echo done
 <NUL set /p=:: Registry Tweaks... 
-call "3-registry.bat" > nul
+call "2-registry.bat" > nul
 echo done
 <NUL set /p=:: Removing Programs... 
-call "4-remove.bat" > nul
+call "3-remove.bat" > nul
 echo done
 <NUL set /p=:: Install Programs... 
-call "5-install.bat" > nul
-echo done
-<NUL set /p=:: Mounting Network... 
-call "6-network.bat" > nul
-echo done
-<NUL set /p=:: Windows Updates... 
-call "7-install.bat" > nul
+call "4-install.bat" > nul
 echo done
 <NUL set /p=:: Clean Up... 
-call "8-clean.bat" > nul
+call "5-clean.bat" > nul
 echo done
 
 rem complete
diff --git a/1-activation.bat b/1-activation.bat
@@ -1,6 +0,0 @@
-rem server address
-set kms_server=minskio.co.uk
-rem windows activation
-slmgr/skms %kms_server% && slmgr/ato
-rem office activation, if it's installed
-if exist "%ProgramFiles(x86)%\Microsoft Office\Office14\OSPP.VBS" cscript "%ProgramFiles(x86)%\Microsoft Office\Office14\OSPP.VBS" /sethst:%kms_server% && cscript "%ProgramFiles(x86)%\Microsoft Office\Office14\OSPP.VBS" /act
-\ No newline at end of file
diff --git a/2-tweaks.bat b/1-tweaks.bat
diff --git a/3-registry.bat b/2-registry.bat
diff --git a/4-remove.bat b/3-remove.bat
diff --git a/5-install.bat b/4-install.bat
diff --git a/8-clean.bat b/5-clean.bat
diff --git a/6-network.bat b/6-network.bat
@@ -1,12 +0,0 @@
-rem connect to network shares
-set server=atlas
-ping -n 1 %server% | find "TTL=" >nul 
-if errorlevel 0 ( goto connect ) else ( goto no_connect )
-
-:connect
-net use Z: \\%server%\media /USER:%username% /PERSISTENT:YES
-net use Y: \\%server%\vault /USER:%username% /PERSISTENT:YES
-net use X: \\%server%\downloads /USER:%username% /PERSISTENT:YES
-
-:no_connect
-:eof
-\ No newline at end of file
diff --git a/7-updates.bat b/7-updates.bat
@@ -1,3 +0,0 @@
-rem install windows media framework, if they exist after mounting network
-if exist Z:\images\windows/KB3133719-x64.msu wusa.exe Z:\images\windows/KB3133719-x64.msu /quiet /norestart
-if exist Z:\images\windows/KB3133719-x86.msu wusa.exe Z:\images\windows/KB3133719-x86.msu /quiet /norestart
-\ No newline at end of file