From 9f25b1df9ca6d86afd1fe90cd0ddeca9d3c9d216 Mon Sep 17 00:00:00 2001
From: "Michael H.G. Schmidt" <michael@schmidt2.de>
Date: Mon, 8 Mar 2021 10:44:15 +0100
Subject: [PATCH] some bugfixes and introduced new tool: setacl.exe

---
 scripts/autoconfig-all.cmd         |  22 +++++++++++-----------
 scripts/delete-edgekeys.reg        | Bin 33878 -> 0 bytes
 scripts/disable-accountpicture.cmd |  16 ++++++++++++----
 scripts/settings.cmd               |   2 +-
 scripts/uninstall-edge.cmd         |  18 ++++++++++++++----
 scripts/unpack-zipfiles.cmd        |   6 ++++++
 software/basic.csv                 |   1 +
 7 files changed, 45 insertions(+), 20 deletions(-)
 delete mode 100644 scripts/delete-edgekeys.reg

diff --git a/scripts/autoconfig-all.cmd b/scripts/autoconfig-all.cmd
index c6b1bb0..60c8b94 100644
--- a/scripts/autoconfig-all.cmd
+++ b/scripts/autoconfig-all.cmd
@@ -15,23 +15,17 @@ date /t
 time /t
 echo.
 
-echo loading settings ...
-call settings.cmd
-echo windows_updates=%windows_updates%
-echo.
-echo ++++++++++++++++++
-
 echo creating %T% ...
 mkdir %T% 1>nul 2>nul
 
 echo cd to %SCRIPTS% ...
 cd /D %SCRIPTS%
 
-echo.
-echo #######################
-echo ### GLOBAL settings ###
-echo #######################
-echo.
+echo loading settings ...
+call settings.cmd
+echo ++++++++++++++++++
+echo windows_updates=%windows_updates%
+echo ++++++++++++++++++
 
 rem 7-zip is essential for other scripts ...
 call unpack-7zip.cmd
@@ -49,6 +43,12 @@ rem copy some other stuff ...
 call copy-exefiles.cmd
 echo.
 
+echo.
+echo #######################
+echo ### MODIFICATIONS   ###
+echo #######################
+echo.
+
 rem this must be done EARLY!
 if %windows_updates% == 0 (
   call disable-updates.cmd 
diff --git a/scripts/delete-edgekeys.reg b/scripts/delete-edgekeys.reg
deleted file mode 100644
index cb4320e482c5919dda6a9513b7aba0afdc1e7b9e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 33878
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

diff --git a/scripts/disable-accountpicture.cmd b/scripts/disable-accountpicture.cmd
index 15e6da0..e0a4653 100644
--- a/scripts/disable-accountpicture.cmd
+++ b/scripts/disable-accountpicture.cmd
@@ -2,11 +2,19 @@
 
 set TARGET="%ALLUSERSPROFILE%\Microsoft\User Account Pictures"
 
-rem empty logo (disables all logos on logon screen)
-rem set LOGO=config\user-empty.png
+rem default: empty logo (disables all logos on logon screen)
+set LOGO=config\user-empty.png
 
-rem windows logo taken from: http://pngimg.com/image/23601
-set LOGO=config\windows-logo.png
+echo loading settings ...
+call settings.cmd
+echo ++++++++++++++++++
+echo logon_logo=%logon_logo%
+echo ++++++++++++++++++
+
+if %logon_logo% == 1 (
+  rem windows logo taken from: http://pngimg.com/image/23601
+  set LOGO=config\windows-logo.png
+)
 
 echo ####### %0 #######
 
diff --git a/scripts/settings.cmd b/scripts/settings.cmd
index 09ecc08..379f885 100644
--- a/scripts/settings.cmd
+++ b/scripts/settings.cmd
@@ -1,2 +1,2 @@
 set windows_updates=1
-
+set logon_logo=1
diff --git a/scripts/uninstall-edge.cmd b/scripts/uninstall-edge.cmd
index b7e838e..57e01cc 100644
--- a/scripts/uninstall-edge.cmd
+++ b/scripts/uninstall-edge.cmd
@@ -27,10 +27,20 @@ reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\EdgeUpdate" ^
   /v "DoNotUpdateToEdgeWithChromium" /d 1 /t REG_DWORD /f
 
 echo.
-echo ... and finally delete ALL edge registry keys
-echo hoping that frankensteins monster cannot come back after this ...
-regedit /S delete-edgekeys.reg
-echo READY.
+echo trying to remove stale entries from software list ...
+for %%K in (
+
+  "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge"
+  "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge"
+
+) do (
+
+  echo %%K
+  SetACL.exe -on %%K -ot reg -actn setowner -ownr "n:Administrators" 1>nul 2>nul
+  SetACL.exe -on %%K -ot reg -actn ace -ace "n:Administrators;p:full" 1>nul 2>nul
+  reg delete %%K /f
+
+)
 
 echo.
 echo ####### %0 #######
diff --git a/scripts/unpack-zipfiles.cmd b/scripts/unpack-zipfiles.cmd
index ea7f6e3..f77e974 100644
--- a/scripts/unpack-zipfiles.cmd
+++ b/scripts/unpack-zipfiles.cmd
@@ -20,6 +20,7 @@ for %%A in (
   rclone
   regscanner
   restic
+  setacl
   vim
   winscp
   wub
@@ -87,6 +88,11 @@ move /Y %T%\restic\*.exe %TOOLS%\restic.exe
 rd /S /Q %T%\restic
 echo.
 
+echo Setacl
+move /Y %T%\setacl\*.exe %TOOLS%\setacl.exe
+rd /S /Q %T%\setacl
+echo.
+
 echo VIM
 move /Y %T%\vim\vim.exe %TOOLS%
 rd /S /Q %T%\vim
diff --git a/software/basic.csv b/software/basic.csv
index 54607de..a61bce4 100644
--- a/software/basic.csv
+++ b/software/basic.csv
@@ -22,3 +22,4 @@ https://www.nirsoft.net/utils/regscanner-x64.zip regscanner.zip
 http://www.drivesnapshot.de/download/snapshot64.exe snapshot64.exe
 https://ftp.halifax.rwth-aachen.de/videolan/vlc/3.0.12/win64/vlc-3.0.12-win64.exe vlc-setup.exe
 https://github.com/microsoft/terminal/releases/download/v1.5.10411.0/Microsoft.WindowsTerminal_1.5.10411.0_8wekyb3d8bbwe.msixbundle windowsterminal-setup.msixbundle
+https://helgeklein.com/downloads/SetACL/current/SetACL%20(executable%20version).zip setacl.zip