From c477fb9802397d7cddb9875fbc9fcfed0aa47f51 Mon Sep 17 00:00:00 2001
From: "Michael H.G. Schmidt" <michael@schmidt2.de>
Date: Fri, 24 Feb 2023 08:25:11 +0100
Subject: [PATCH] Taskkills should be done with Username! #106

---
 {optional => scripts}/destroy-activation.cmd |  3 ---
 {optional => tools}/block-updates.cmd        |  0
 tools/logon.cmd                              | 11 +++--------
 tools/reset-firefox.cmd                      |  2 +-
 tools/restart-explorer.cmd                   |  2 +-
 5 files changed, 5 insertions(+), 13 deletions(-)
 rename {optional => scripts}/destroy-activation.cmd (89%)
 rename {optional => tools}/block-updates.cmd (100%)

diff --git a/optional/destroy-activation.cmd b/scripts/destroy-activation.cmd
similarity index 89%
rename from optional/destroy-activation.cmd
rename to scripts/destroy-activation.cmd
index 01bb2bf..30da5ce 100644
--- a/optional/destroy-activation.cmd
+++ b/scripts/destroy-activation.cmd
@@ -29,9 +29,6 @@ echo Hiding activation menu in windows settings app ...
 reg add "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Policies\Explorer" ^
 /v SettingsPageVisibility /t REG_SZ /D "hide:activation" /f
 
-echo Removing the missing activation watermark on desktop (System) ...
-bcdedit /set TESTSIGNING OFF
-
 echo.
 echo INFO: please REBOOT your machine to activate the changes!
 echo.
diff --git a/optional/block-updates.cmd b/tools/block-updates.cmd
similarity index 100%
rename from optional/block-updates.cmd
rename to tools/block-updates.cmd
diff --git a/tools/logon.cmd b/tools/logon.cmd
index 224765d..3638dc8 100644
--- a/tools/logon.cmd
+++ b/tools/logon.cmd
@@ -467,11 +467,6 @@ rd /S /Q "%STARTMENU%\Maintenance" 2>nul
 rd /S /Q "%STARTMENU%\System Tools" 2>nul
 rd /S /Q "%STARTMENU%\Windows Powershell" 2>nul
 
-rem get rid of activation messages ...
-echo Removing the activation watermark on desktop (User) ...
-reg add "HKEY_CURRENT_USER\Control Panel\Desktop" ^
-/v PaintDesktopVersion /t REG_DWORD /D 0 /f
-
 rem ... stupid OS!
 rem IE is such a zombie. I's coming back all the time ...
 echo Removing IE link in users start menu ...
@@ -523,19 +518,19 @@ echo Setting desktop COLOUR ...
 
 if %start_desktopinfo% == 1 (
   echo Starting the Desktopinfo tool ...
-  taskkill /F /IM DesktopInfo64.exe 2>nul
+  taskkill /F /IM DesktopInfo64.exe /FI "USERNAME eq %USERNAME%" 2>nul
   start /B "" %TOOLS%\desktopinfo\DesktopInfo64.exe /ini=%TOOLS%\desktopinfo\desktopinfo.ini
 )
 
 rem kill settings window
 rem (in case it hasn't been killed by the modify script)
-taskkill /F /IM SystemSettings.exe 2>nul
+taskkill /F /IM SystemSettings.exe /FI "USERNAME eq %USERNAME%" 2>nul
 
 goto :eof
 
 :RESTART_EXPLORER
 echo Restarting windows explorer ...
-taskkill /f /im explorer.exe 2>nul
+taskkill /f /im explorer.exe /FI "USERNAME eq %USERNAME%" 2>nul
 ping 127.0.0.1 -n 3 >nul 2>nul
 start explorer.exe
 goto :eof
diff --git a/tools/reset-firefox.cmd b/tools/reset-firefox.cmd
index fd9d196..eed5948 100644
--- a/tools/reset-firefox.cmd
+++ b/tools/reset-firefox.cmd
@@ -1,7 +1,7 @@
 @echo off
 
 echo killing firefox ...
-taskkill /f /im firefox.exe 1>nul 2>nul
+taskkill /f /im firefox.exe /FI "USERNAME eq %USERNAME%" 2>nul
 
 echo deleting user profile ...
 deltree %USERPROFILE%\AppData\Local\Mozilla
diff --git a/tools/restart-explorer.cmd b/tools/restart-explorer.cmd
index 8be7a98..9399f16 100644
--- a/tools/restart-explorer.cmd
+++ b/tools/restart-explorer.cmd
@@ -1,7 +1,7 @@
 @echo off
 
 echo Killing explorer ...
-taskkill /f /im explorer.exe 2>nul
+taskkill /f /im explorer.exe /FI "USERNAME eq %USERNAME%" 2>nul
 echo sleeping 2 seconds ...
 ping 127.0.0.1 -n 2 >nul 2>&1
 echo starting ...