diff --git a/optional/install-irfanview.cmd b/optional/install-irfanview.cmd index da5f375..9f573b4 100644 --- a/optional/install-irfanview.cmd +++ b/optional/install-irfanview.cmd @@ -21,7 +21,8 @@ echo removing IrfanView startmenu folder ... rd /S /Q %STARTMENU%\"IrfanView" 2>nul echo moving IrfanView desktop links to Startmenu ... -move /Y "%PUBLIC%\Desktop\IrfanView*.lnk" %STARTMENU% +mkdir %STARTMENU%\IrfanView 2>nul +move /Y "%PUBLIC%\Desktop\IrfanView*.lnk" %STARTMENU%\IrfanView rem refresh desktop (W10 style) ie4uinit.exe -show diff --git a/optional/install-ntlite.cmd b/optional/install-ntlite.cmd index 7ef5ce6..d1bdd2d 100644 --- a/optional/install-ntlite.cmd +++ b/optional/install-ntlite.cmd @@ -20,7 +20,8 @@ echo installing NTLite ... start /wait %EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS echo moving NTLite startmenu shortcut ... -move /Y %STARTMENU%\"NTLite\NTLite.lnk" %STARTMENU% 2>nul +mkdir %STARTMENU%\Tools 2>nul +move /Y %STARTMENU%\"NTLite\NTLite.lnk" %STARTMENU%\Tools 2>nul echo cleanup ... rd /S /Q %STARTMENU%\"NTLite" 2>nul diff --git a/optional/install-totalcommander.cmd b/optional/install-totalcommander.cmd index 411ea9a..6a30094 100644 --- a/optional/install-totalcommander.cmd +++ b/optional/install-totalcommander.cmd @@ -4,7 +4,7 @@ if %ERRORLEVEL% neq 0 exit /b set EXE=..\software\totalcommander-setup.exe set KEY=..\company\wincmd.key -set TARGET=%PROGRAMFILES%\totalcommander +set TARGET=c:\totalcmd set STARTMENU=%PROGRAMDATA%\"Microsoft\Windows\Start Menu\Programs" set STARTMENU_USER=%APPDATA%\"Microsoft\Windows\Start Menu\Programs" @@ -18,14 +18,13 @@ echo ####### %0 ####### echo installing TotalCommander ... start /wait %EXE% /AHMGDU -rem ... stupid Total Commander is installing its links to user area ? WTF ? echo renaming and moving TotalCommander desktop link to public desktop ... -move /Y "%USERPROFILE%\Desktop\Total Commander*" "%PUBLIC%\Desktop\TCM.lnk" -icacls %PUBLIC%\Desktop\TCM.lnk /grant Users:F +move /Y "%USERPROFILE%\Desktop\Total Commander*" %PUBLIC%\Desktop\"Total Commander.lnk" +icacls %PUBLIC%\Desktop\"Total Commander.lnk" /grant Users:F echo moving Total Commander startmenu shortcut ... -move /Y %STARTMENU_USER%\"Total Commander\Total Commander 64 bit.lnk" %STARTMENU% -icacls %STARTMENU%\"Total Commander\Total Commander 64 bit.lnk" /grant Users:F +move /Y %STARTMENU_USER%\"Total Commander\Total Commander 64 bit.lnk" %STARTMENU%\Tools\"Total Commander.lnk" +icacls %STARTMENU%\Tools\"Total Commander.lnk" /grant Users:F echo removing Total Commander startmenu folder ... rd /S /Q %STARTMENU_USER%\"Total Commander" 2>nul diff --git a/scripts/install-shortcuts.cmd b/scripts/install-shortcuts.cmd index 3ca41c7..d25c5fa 100644 --- a/scripts/install-shortcuts.cmd +++ b/scripts/install-shortcuts.cmd @@ -9,7 +9,8 @@ echo copying desktop shortcuts ... xcopy /CDI /HERBY desktop %DESKTOP% echo copying startmenu shortcuts ... -xcopy /CDI /HERBY startmenu %STARTMENU% +mkdir %STARTMENU%\Tools 2>nul +xcopy /CDI /HERBY startmenu %STARTMENU%\Tools echo ####### %0 ####### diff --git a/scripts/install-win32diskimager.cmd b/scripts/install-win32diskimager.cmd index d0fbdcd..c827b22 100644 --- a/scripts/install-win32diskimager.cmd +++ b/scripts/install-win32diskimager.cmd @@ -14,7 +14,8 @@ echo installing WIN32DISKIMAGER ... %EXE% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS echo changing startmenu folder ... -move /Y %STARTMENU%\"Image Writer\Win32DiskImager.lnk" %STARTMENU% +mkdir %STARTMENU%\Tools 2>nul +move /Y %STARTMENU%\"Image Writer\Win32DiskImager.lnk" %STARTMENU%\Tools echo removing win32diskimager startmenu folder ... rd /S /Q %STARTMENU%\"Image Writer" 2>nul diff --git a/scripts/startmenu/CMD.lnk b/scripts/startmenu/Commandline.lnk similarity index 100% rename from scripts/startmenu/CMD.lnk rename to scripts/startmenu/Commandline.lnk diff --git a/scripts/startmenu/Snapshot64.lnk b/scripts/startmenu/Drive Snapshot.lnk similarity index 100% rename from scripts/startmenu/Snapshot64.lnk rename to scripts/startmenu/Drive Snapshot.lnk diff --git a/scripts/startmenu/MediaCreationTool20H2.lnk b/scripts/startmenu/Media Creation Tool (20H2).lnk similarity index 100% rename from scripts/startmenu/MediaCreationTool20H2.lnk rename to scripts/startmenu/Media Creation Tool (20H2).lnk diff --git a/scripts/startmenu/Offline Registry Finder.lnk b/scripts/startmenu/Offline Registry Finder.lnk new file mode 100644 index 0000000..2629263 Binary files /dev/null and b/scripts/startmenu/Offline Registry Finder.lnk differ diff --git a/scripts/startmenu/PuTTYgen.lnk b/scripts/startmenu/PuTTY Key Generator.lnk similarity index 100% rename from scripts/startmenu/PuTTYgen.lnk rename to scripts/startmenu/PuTTY Key Generator.lnk diff --git a/scripts/startmenu/PuTTY.lnk b/scripts/startmenu/PuTTY.lnk new file mode 100644 index 0000000..5592cb0 Binary files /dev/null and b/scripts/startmenu/PuTTY.lnk differ diff --git a/scripts/startmenu/RegScanner.lnk b/scripts/startmenu/RegScanner.lnk new file mode 100644 index 0000000..fb2fdda Binary files /dev/null and b/scripts/startmenu/RegScanner.lnk differ diff --git a/scripts/startmenu/Registry Finder.lnk b/scripts/startmenu/Registry Finder.lnk new file mode 100644 index 0000000..e2838e1 Binary files /dev/null and b/scripts/startmenu/Registry Finder.lnk differ diff --git a/scripts/startmenu/RDP.lnk b/scripts/startmenu/Remote Desktop Connection.lnk similarity index 100% rename from scripts/startmenu/RDP.lnk rename to scripts/startmenu/Remote Desktop Connection.lnk diff --git a/scripts/startmenu/VNC.lnk b/scripts/startmenu/Tight VNC.lnk similarity index 100% rename from scripts/startmenu/VNC.lnk rename to scripts/startmenu/Tight VNC.lnk diff --git a/scripts/startmenu/ISO-Downloader.lnk b/scripts/startmenu/Windows ISO Downloader.lnk similarity index 100% rename from scripts/startmenu/ISO-Downloader.lnk rename to scripts/startmenu/Windows ISO Downloader.lnk diff --git a/scripts/startmenu/WUB.lnk b/scripts/startmenu/Windows Update Blocker.lnk similarity index 100% rename from scripts/startmenu/WUB.lnk rename to scripts/startmenu/Windows Update Blocker.lnk diff --git a/tools/logon.cmd b/tools/logon.cmd index 0098b49..912b2a2 100644 --- a/tools/logon.cmd +++ b/tools/logon.cmd @@ -152,13 +152,18 @@ if %ERRORLEVEL% == 0 ( 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" 1>nul 2>nul + %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 + 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" + ) rem WORKSPACE folder @@ -301,15 +306,6 @@ rem Onedrive ... echo Removing OneDrive link in start menu ... del /F %APPDATA%\"Microsoft\Windows\Start Menu\Programs\OneDrive.lnk" -rem finally remove some useless directories in the users start menu ... -echo Removing 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 - rem create a statusfile (this codeblock must be executed only once per user) ... echo 1 >%USERCONFIG_DONE% @@ -355,6 +351,11 @@ if %ERRORLEVEL% == 0 ( echo Removing public accessibility tools folder ... rd /S /Q %STARTMENU_PUBLIC%\Accessibility 2>nul + echo Moving "settings" link to system tools folder ... + attrib -S %STARTMENU_PUBLIC%\"Immersive Control Panel.lnk" + move /Y %STARTMENU_PUBLIC%\"Immersive Control Panel.lnk" ^ + %STARTMENU_PUBLIC%\"System Tools" 2>nul + ) else ( echo Removing accessibility tools folder ... @@ -408,6 +409,14 @@ for %%D in ( ) +echo Removing 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 + echo. echo Other tasks and fixes for the user echo ########################################