From 12d13e8c60d4e863bdfd37cb7a9325a3eaf22826 Mon Sep 17 00:00:00 2001
From: "Michael H.G. Schmidt" <michael@schmidt2.de>
Date: Tue, 27 Dec 2022 19:54:32 +0100
Subject: [PATCH] .

---
 scripts/autoconfig-all.cmd          |  2 ++
 scripts/cleanup-taskscheduler.cmd   | 12 +++---------
 scripts/cleanup-taskscheduler.ps1   |  6 ++++++
 scripts/cleanup-tiles.cmd           |  1 +
 scripts/disable-networkfeatures.cmd |  1 +
 5 files changed, 13 insertions(+), 9 deletions(-)
 create mode 100644 scripts/cleanup-taskscheduler.ps1

diff --git a/scripts/autoconfig-all.cmd b/scripts/autoconfig-all.cmd
index 835becb..764f1ca 100644
--- a/scripts/autoconfig-all.cmd
+++ b/scripts/autoconfig-all.cmd
@@ -246,9 +246,11 @@ echo.
 
 rem ... remove stupid public folders
 call cleanup-publicdir.cmd
+echo.
 
 rem ... remove ALL tasks from the scheduler
 call cleanup-taskscheduler.cmd
+echo.
 
 date /t
 time /t
diff --git a/scripts/cleanup-taskscheduler.cmd b/scripts/cleanup-taskscheduler.cmd
index d164cf7..ee09cb2 100644
--- a/scripts/cleanup-taskscheduler.cmd
+++ b/scripts/cleanup-taskscheduler.cmd
@@ -1,19 +1,13 @@
 @echo off
+set TOOLS=c:\tools
 
 echo ####### %0 #######
 
 echo removing all tasks in the task scheduler ...
-
-rem using a command ...
 schtasks /delete /TN * /F
 
-rem file system ...
-rd /S /Q %SystemRoot%\system32\Tasks
-mkdir %SystemRoot%\system32\Tasks
-
-rem regsitry ...
-reg delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Schedule\TaskCache\Tasks" /f
-reg delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Schedule\TaskCache\Tree\Microsoft" /f
+echo deleting folders in the task scheduler ...
+powershell -command %TOOLS%\scripts\cleanup-taskscheduler.ps1
 
 echo ####### %0 #######
 
diff --git a/scripts/cleanup-taskscheduler.ps1 b/scripts/cleanup-taskscheduler.ps1
new file mode 100644
index 0000000..850af89
--- /dev/null
+++ b/scripts/cleanup-taskscheduler.ps1
@@ -0,0 +1,6 @@
+
+$scheduleObject = New-Object -ComObject Schedule.Service
+$scheduleObject.connect()
+$rootFolder = $scheduleObject.GetFolder("\")
+$rootFolder.DeleteFolder("\Microsoft",$null)
+
diff --git a/scripts/cleanup-tiles.cmd b/scripts/cleanup-tiles.cmd
index ec4165f..8ae302b 100644
--- a/scripts/cleanup-tiles.cmd
+++ b/scripts/cleanup-tiles.cmd
@@ -1,4 +1,5 @@
 @echo off
+set TOOLS=c:\tools
 
 echo ####### %0 #######
 
diff --git a/scripts/disable-networkfeatures.cmd b/scripts/disable-networkfeatures.cmd
index 85531f7..943683a 100644
--- a/scripts/disable-networkfeatures.cmd
+++ b/scripts/disable-networkfeatures.cmd
@@ -1,4 +1,5 @@
 @echo off
+set TOOLS=c:\tools
 
 echo ####### %0 #######