From 1fe149c06a347b7f29bfac66fc82c8f51c187373 Mon Sep 17 00:00:00 2001 From: "Michael H.G. Schmidt" Date: Sat, 21 Jan 2023 16:16:11 +0100 Subject: [PATCH] bugfixes --- optional/install-totalcommander.cmd | 14 +++++----- scripts/modify-desktoptheme.cmd | 33 ++---------------------- tools/logon.cmd | 40 +++++++++++++++++++++++------ 3 files changed, 41 insertions(+), 46 deletions(-) diff --git a/optional/install-totalcommander.cmd b/optional/install-totalcommander.cmd index 6a30094..279f2be 100644 --- a/optional/install-totalcommander.cmd +++ b/optional/install-totalcommander.cmd @@ -5,8 +5,8 @@ if %ERRORLEVEL% neq 0 exit /b set EXE=..\software\totalcommander-setup.exe set KEY=..\company\wincmd.key set TARGET=c:\totalcmd -set STARTMENU=%PROGRAMDATA%\"Microsoft\Windows\Start Menu\Programs" -set STARTMENU_USER=%APPDATA%\"Microsoft\Windows\Start Menu\Programs" +set STARTMENU=%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs +set STARTMENU_USER=%APPDATA%\Microsoft\Windows\Start Menu\Programs if NOT EXIST %EXE% ( echo ERROR: %EXE% not found! @@ -19,15 +19,15 @@ echo installing TotalCommander ... start /wait %EXE% /AHMGDU echo renaming and moving TotalCommander desktop link to public desktop ... -move /Y "%USERPROFILE%\Desktop\Total Commander*" %PUBLIC%\Desktop\"Total Commander.lnk" -icacls %PUBLIC%\Desktop\"Total Commander.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%\Tools\"Total Commander.lnk" -icacls %STARTMENU%\Tools\"Total Commander.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 +rd /S /Q "%STARTMENU_USER%\Total Commander" 2>nul if EXIST %KEY% ( echo installing license ... diff --git a/scripts/modify-desktoptheme.cmd b/scripts/modify-desktoptheme.cmd index ad29955..354853a 100644 --- a/scripts/modify-desktoptheme.cmd +++ b/scripts/modify-desktoptheme.cmd @@ -3,18 +3,6 @@ set TOOLS=c:\tools set CONFIG=%TOOLS%\scripts\config set THEMES=C:\Windows\Resources\Themes -set R=0 -set G=0 -set B=0 - -IF %1.==. GOTO USAGE -set R=%1 - -IF %2.==. GOTO USAGE -set G=%2 - -IF %3.==. GOTO USAGE -set B=%3 echo ####### %0 ####### @@ -27,27 +15,10 @@ if %ERRORLEVEL% == 0 ( echo Activating AEROLITE theme ... powershell -command "Start-Process %THEMES%\aerolite.theme" -echo sleep 5 seconds ... -ping 127.0.0.1 -n 5 > NUL 2>&1 +echo sleep 3 seconds ... +ping 127.0.0.1 -n 3 > NUL 2>&1 taskkill /F /IM SystemSettings.exe 2>nul -echo sleep 5 seconds ... -ping 127.0.0.1 -n 5 > NUL 2>&1 - -echo Removing the desktop wallpaper ... -reg add "HKCU\Control Panel\Desktop" /v WallPaper /t REG_SZ /d " " /f 1>nul -RUNDLL32.EXE user32.dll,UpdatePerUserSystemParameters - -echo Setting the desktop colour ... -%TOOLS%\setbgcol %R% %G% %B% - echo ####### %0 ####### -GOTO END - -:USAGE -echo "usage: %0 " -echo. - -:END diff --git a/tools/logon.cmd b/tools/logon.cmd index a01c499..99c6ab5 100644 --- a/tools/logon.cmd +++ b/tools/logon.cmd @@ -62,14 +62,11 @@ echo ##### GENERIC tasks and settings echo ##### echo. -echo Setting desktop COLOUR ... -%TOOLS%\setbgcol %bgcol_R% %bgcol_G% %bgcol_B% - -echo Starting BGInfo tool ... -%TOOLS%\bginfo\bginfo64.exe %TOOLS%\bginfo\config.bgi /NOLICPROMPT /silent /timer:0 - -echo Setting RECYCLE BIN limits ... +rem remove desktop wallpaper, set desktop colour and start bginfo +call :BGINFO echo. + +rem set RECYCLE BIN limits ... powershell -command %TOOLS%\scripts\set-recyclebin.ps1 echo. @@ -169,7 +166,8 @@ rem =========== rem setting Aerolite theme... if %install_aerolite% == 1 ( - call %TOOLS%\scripts\modify-desktoptheme.cmd %bgcol_R% %bgcol_G% %bgcol_B% + call %TOOLS%\scripts\modify-desktoptheme.cmd + call :BGINFO echo. ) @@ -430,6 +428,10 @@ rd /S /Q %STARTMENU%\"Maintenance" 2>nul rd /S /Q %STARTMENU%\"System Tools" 2>nul rd /S /Q %STARTMENU%\"Windows Powershell" 2>nul +rem ... stupid OS! (it pins "dead" icons to the taskbar) +echo Removing all pinned icons from taskbar ... +reg delete "HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Taskband" /f > NUL 2>&1 + rem ... stupid OS! rem IE is such a zombie. I's coming back all the time ... echo Removing IE link in users start menu ... @@ -460,3 +462,25 @@ if %ERRORLEVEL% NEQ 0 ( pause ) +goto END + +rem #################################################### + +:BGINFO + +echo Removing the desktop wallpaper ... +reg add "HKCU\Control Panel\Desktop" /v WallPaper /t REG_SZ /d " " /f 1>nul +RUNDLL32.EXE user32.dll,UpdatePerUserSystemParameters + +echo Setting desktop COLOUR ... +%TOOLS%\setbgcol %bgcol_R% %bgcol_G% %bgcol_B% + +echo Starting BGInfo tool ... +%TOOLS%\bginfo\bginfo64.exe %TOOLS%\bginfo\config.bgi /NOLICPROMPT /silent /timer:0 + +goto :eof + +rem #################################################### + +:END +