From a608062ea352f89fb7519b587b392da10e53cd9d Mon Sep 17 00:00:00 2001
From: "Michael H.G. Schmidt" <michael@schmidt2.de>
Date: Tue, 14 Feb 2023 14:44:37 +0100
Subject: [PATCH] bugfix

---
 tools/logon.cmd | 60 ++++++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/tools/logon.cmd b/tools/logon.cmd
index 7af3c23..4d322c5 100644
--- a/tools/logon.cmd
+++ b/tools/logon.cmd
@@ -150,18 +150,18 @@ if %ERRORLEVEL% == 0 (
   rem ... stupid OS!
   rem why the heck is the Startmenu entry for "System Tools" installed per user ? stupid Microsoft.
   echo Moving system tools links ...
-  move /Y %STARTMENU%\"System Tools\*.*" ^
-    %STARTMENU_PUBLIC%\"System Tools" 2>nul
+  move /Y "%STARTMENU%\System Tools\*.*" ^
+    "%STARTMENU_PUBLIC%\System Tools" 2>nul
 
   rem Removing and renaming objects in the "System Tools" folder...
-  move /Y %STARTMENU_PUBLIC%\"System Tools\computer.lnk" ^
-    %STARTMENU_PUBLIC%\"System Tools\This PC.lnk" 1>nul 2>nul
-  del /F %STARTMENU_PUBLIC%\"System Tools\Command Prompt.lnk" 2>nul
+  move /Y "%STARTMENU_PUBLIC%\System Tools\computer.lnk" ^
+    "%STARTMENU_PUBLIC%\System Tools\This PC.lnk" 1>nul 2>nul
+  del /F "%STARTMENU_PUBLIC%\System Tools\Command Prompt.lnk" 2>nul
 
   rem moving Powershell ISE icons ...
-  move /Y %STARTMENU_PUBLIC%\"Windows Powershell\Windows PowerShell ISE.lnk" ^
-    %STARTMENU_PUBLIC%\"System Tools" 2>nul
-  rd /S /Q %STARTMENU_PUBLIC%\"Windows Powershell"
+  move /Y "%STARTMENU_PUBLIC%\Windows Powershell\Windows PowerShell ISE.lnk" ^
+    "%STARTMENU_PUBLIC%\System Tools" 2>nul
+  rd /S /Q "%STARTMENU_PUBLIC%\Windows Powershell"
 
 )
 
@@ -243,7 +243,7 @@ reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced" ^
 echo Loading the OpenShell configuration ...
 rem config must be full qualified pathname (OpenShell BUG!)
 set CONFIG=%TOOLS%\scripts\config\OpenshellSettings.xml
-"%ProgramFiles%"\Open-Shell\StartMenu.exe -xml %CONFIG%
+"%ProgramFiles%\Open-Shell\StartMenu.exe" -xml %CONFIG%
 
 echo.
 echo Removing the "user" folders from the explorer navigation pane ...
@@ -368,19 +368,19 @@ if %ERRORLEVEL% == 0 (
   rem must be done (here) more than once, because Microsoft patches can reinstall some tools ...
   echo.
   echo Moving accessibility tools to accessories folder ...
-  move /Y %STARTMENU%\"Accessibility\*.*" ^
-    %STARTMENU_PUBLIC%\Accessories 2>nul
+  move /Y "%STARTMENU%\Accessibility\*.*" ^
+    "%STARTMENU_PUBLIC%\Accessories" 2>nul
 
-  move /Y %STARTMENU_PUBLIC%\"Accessibility\*.*" ^
-    %STARTMENU_PUBLIC%\Accessories 2>nul
+  move /Y "%STARTMENU_PUBLIC%\Accessibility\*.*" ^
+    "%STARTMENU_PUBLIC%\Accessories" 2>nul
 
   echo Removing public accessibility tools folder ...
-  rd /S /Q %STARTMENU_PUBLIC%\Accessibility 2>nul
+  rd /S /Q "%STARTMENU_PUBLIC%\Accessibility" 2>nul
 
   echo Moving "settings" link to system tools folder ...
-  attrib -S %STARTMENU_PUBLIC%\"Immersive Control Panel.lnk" 1>nul 2>nul
-  move /Y %STARTMENU_PUBLIC%\"Immersive Control Panel.lnk" ^
-    %STARTMENU_PUBLIC%\"System Tools" 2>nul
+  attrib -S "%STARTMENU_PUBLIC%\Immersive Control Panel.lnk" 1>nul 2>nul
+  move /Y "%STARTMENU_PUBLIC%\Immersive Control Panel.lnk" ^
+    "%STARTMENU_PUBLIC%\System Tools" 2>nul
 
   rem setting permissions for normal users ...
   icacls "%STARTMENU_PUBLIC%\System Tools\*" /grant Users:R 1>nul
@@ -394,13 +394,13 @@ if %ERRORLEVEL% == 0 (
   rem ===========
 
   echo Removing accessibility tools folder ...
-  rd /S /Q %STARTMENU%\Accessibility 2>nul
+  rd /S /Q "%STARTMENU%\Accessibility" 2>nul
 
   echo Removing users accessories folder ...
-  rd /S /Q %STARTMENU%\Accessories 2>nul
+  rd /S /Q "%STARTMENU%\Accessories" 2>nul
 
   echo Removing users system tools folder ...
-  rd /S /Q %STARTMENU%\"System Tools" 2>nul
+  rd /S /Q "%STARTMENU%\System Tools" 2>nul
 
 )
 
@@ -451,7 +451,7 @@ for %%D in (
 )
 
 rem delete strange "about" link in IrfanView Startmenu folder ...
-del /F /Q  %STARTMENU_PUBLIC%\IrfanView\"About IrfanView.lnk" 2>nul
+del /F /Q  "%STARTMENU_PUBLIC%\IrfanView\About IrfanView.lnk" 2>nul
 
 echo.
 echo Other tasks and fixes for the user
@@ -459,12 +459,12 @@ echo ########################################
 echo.
 
 echo Removing even more startmenu crap ...
-rd /S /Q %STARTMENU%\"Accessories" 2>nul
-rd /S /Q %STARTMENU%\"Accessibility" 2>nul
-rd /S /Q %STARTMENU%\"Administrative Tools" 2>nul
-rd /S /Q %STARTMENU%\"Maintenance" 2>nul
-rd /S /Q %STARTMENU%\"System Tools" 2>nul
-rd /S /Q %STARTMENU%\"Windows Powershell" 2>nul
+rd /S /Q "%STARTMENU%\Accessories" 2>nul
+rd /S /Q "%STARTMENU%\Accessibility" 2>nul
+rd /S /Q "%STARTMENU%\Administrative Tools" 2>nul
+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 missing activation watermark on desktop (User) ...
@@ -474,17 +474,17 @@ reg add "HKEY_CURRENT_USER\Control Panel\Desktop" ^
 rem ... stupid OS!
 rem IE is such a zombie. I's coming back all the time ...
 echo Removing IE link in users start menu ...
-del /F %STARTMENU%\"Accessories\Internet Explorer.lnk" 2>nul
+del /F "%STARTMENU%\Accessories\Internet Explorer.lnk" 2>nul
 
 rem ... stupid OS!
 rem Edge is a zombie too!
 echo Removing microsoft edge links in start menu and desktop ...
-del /F %STARTMENU%\"Microsoft Edge.lnk" 2>nul
+del /F "%STARTMENU%\Microsoft Edge.lnk" 2>nul
 del /F "%USERPROFILE%\Desktop\Microsoft Edge.lnk" 2>nul
 
 rem re-create "Pictures" in case it was deleted ...
 echo Creating "Pictures" folder for snipping tool ...
-mkdir "%USERPROFILE%"\Pictures 2>nul
+mkdir "%USERPROFILE%\Pictures" 2>nul
 
 rem HeidiSQL should be in english - always!
 echo Setting language of HeidiSQL to english ...