From d87758505b255166858f58195f7b33f88ab99a7e Mon Sep 17 00:00:00 2001
From: "Michael H.G. Schmidt" <michael@schmidt2.de>
Date: Sun, 29 Jan 2023 22:04:58 +0100
Subject: [PATCH] added offline handling for powershell packages

---
 scripts/autoconfig-all.cmd    | 11 ++++++-----
 scripts/block-updates.cmd     |  8 +++++---
 scripts/install-psupdate.cmd  | 19 ------------------
 scripts/unpack-pspackages.cmd | 37 +++++++++++++++++++++++++++++++++++
 software/.gitignore           |  2 ++
 software/basic.csv            |  1 +
 6 files changed, 51 insertions(+), 27 deletions(-)
 delete mode 100644 scripts/install-psupdate.cmd
 create mode 100644 scripts/unpack-pspackages.cmd

diff --git a/scripts/autoconfig-all.cmd b/scripts/autoconfig-all.cmd
index f3ee17c..c90f568 100644
--- a/scripts/autoconfig-all.cmd
+++ b/scripts/autoconfig-all.cmd
@@ -64,7 +64,6 @@ echo searchdomains=%searchdomains%
 echo ++++++++++++++++++
 echo.
 
-
 echo #######################
 echo ### UNPACK and COPY ###
 echo #######################
@@ -78,6 +77,10 @@ rem windows update blocker is in the zipfiles ...
 call unpack-zipfiles.cmd
 echo.
 
+rem unpack powershell packages and register them ...
+call unpack-pspackages.cmd
+echo.
+
 rem put vnc in place ...
 call unpack-vnc.cmd
 echo.
@@ -175,6 +178,8 @@ echo.
 call install-shortcuts.cmd
 echo.
 
+powershell -Command "Install-Module -Name PSWindowsUpdate"
+
 rem should be done as late as possible ...
 call install-logonscript.cmd
 echo.
@@ -213,10 +218,6 @@ if %windows_updates% == 1 (
   echo.
 )
 
-rem install a powershell package for updates handling ...
-call install-psupdate.cmd
-echo.
-
 call block-updates.cmd
 echo.
 
diff --git a/scripts/block-updates.cmd b/scripts/block-updates.cmd
index 04a3612..b8a30df 100644
--- a/scripts/block-updates.cmd
+++ b/scripts/block-updates.cmd
@@ -1,15 +1,17 @@
 @echo off
-call check-for-admin
-if %ERRORLEVEL% neq 0 exit /b
 
 echo ####### %0 #######
 
 echo blocking UPDATE KB5005463 aka. PC-Health ...
 powershell -command "Hide-WindowsUpdate -KBArticleID KB5005463 -AcceptAll"
 
+echo blocking UPDATE KB5021751 ...
+echo [ Notifies Microsoft if an Unsupported Office version is installed on Windows ]
+powershell -command "Hide-WindowsUpdate -KBArticleID KB5021751 -AcceptAll"
+
+echo.
 echo showing HIDDEN windows updates ...
 powershell -command "Get-WindowsUpdate -IsHidden"
 
 echo ####### %0 #######
-pause
 
diff --git a/scripts/install-psupdate.cmd b/scripts/install-psupdate.cmd
deleted file mode 100644
index a432476..0000000
--- a/scripts/install-psupdate.cmd
+++ /dev/null
@@ -1,19 +0,0 @@
-@echo off
-call check-for-admin
-if %ERRORLEVEL% neq 0 exit /b
-
-echo ####### %0 #######
-
-echo Installing package provider NuGet ...
-powershell -command "Install-PackageProvider NuGet -Force"
-
-echo Setting policy for PSGallery to trusted ...
-powershell -command "Set-PSRepository PSGallery -InstallationPolicy Trusted"
-
-echo Installing powershell package PSWindowsUpdate ...
-powershell -command "Install-Module PSWindowsUpdate"
-echo.
-
-echo ####### %0 #######
-pause
-
diff --git a/scripts/unpack-pspackages.cmd b/scripts/unpack-pspackages.cmd
new file mode 100644
index 0000000..869cca9
--- /dev/null
+++ b/scripts/unpack-pspackages.cmd
@@ -0,0 +1,37 @@
+@echo off
+
+set TOOLS=c:\tools
+set SOFTWARE=..\software
+set TARGET="%ProgramFiles%\WindowsPowerShell\Modules"
+
+echo ####### %0 #######
+
+rem ######################################
+rem MAIN loop ( unzip nuget packages ) ...
+rem ######################################
+
+for %%A in (
+
+PSWindowsUpdate
+
+) do (
+  
+  if NOT EXIST %SOFTWARE%\%%A.nupkg (
+    echo WARNING: %SOFTWARE%\%%A.nupkg not found!
+  ) else (
+    
+    rem cleanup ...
+    rd /S /Q %TARGET%\%%A
+    
+    echo unpacking %%A.nupkg ...
+    %TOOLS%\7z e -y -aoa -o%TARGET%\%%A %SOFTWARE%\%%A.nupkg 1>nul
+    
+    echo importing module [ %%A ] ...
+    powershell -Command "Import-Module -Name %%A"
+
+  )
+
+)
+
+echo ####### %0 #######
+
diff --git a/software/.gitignore b/software/.gitignore
index 9439135..e6c6eac 100644
--- a/software/.gitignore
+++ b/software/.gitignore
@@ -9,3 +9,5 @@
 *.wim
 *.zip
 *.msixbundle
+*.nupkg
+
diff --git a/software/basic.csv b/software/basic.csv
index 84a9f2f..3e17042 100644
--- a/software/basic.csv
+++ b/software/basic.csv
@@ -38,4 +38,5 @@ https://mark0.net/download/triddefs.zip triddefs.zip
 https://github.com/microsoft/terminal/releases/download/v1.10.2383.0/Microsoft.WindowsTerminal_1.10.2383.0_8wekyb3d8bbwe.msixbundle windowsterminal-setup.msixbundle
 https://kolbi.cz/SetDefaultBrowser.zip setdefaultbrowser.zip
 https://github.com/DavidXanatos/wumgr/releases/download/v1.1/WuMgr_v1.1b.zip wumgr.zip
+https://psg-prod-eastus.azureedge.net/packages/pswindowsupdate.2.2.0.3.nupkg pswindowsupdate.nupkg