From e3bf9e56bd101d80ebd1d754cb8ebe6c4c41e7cb Mon Sep 17 00:00:00 2001
From: "Michael H.G. Schmidt" <michael@schmidt2.de>
Date: Fri, 20 Jan 2023 08:15:22 +0100
Subject: [PATCH] fixed aerolite theme bugs

---
 scripts/modify-desktoptheme.cmd | 28 +++++++++++++++--
 tools/logon.cmd                 | 54 ++++++++++++++++-----------------
 2 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/scripts/modify-desktoptheme.cmd b/scripts/modify-desktoptheme.cmd
index 5c31773..333e4c8 100644
--- a/scripts/modify-desktoptheme.cmd
+++ b/scripts/modify-desktoptheme.cmd
@@ -3,12 +3,30 @@ 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 #######
 
-copy /Y %CONFIG%\aerolite.theme %THEMES%
+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 activating AEROLITE theme ...
+echo Setting the desktop colour ...
+%TOOLS%\setbgcol %R% %G% %B%
+
+echo Activating AEROLITE theme ...
+copy /Y %CONFIG%\aerolite.theme %THEMES%
 @echo on
 powershell -command "Start-Process %THEMES%\aerolite.theme"
 @echo off
@@ -19,4 +37,10 @@ ping 127.0.0.1 -n 5 > NUL 2>&1
 taskkill /F /IM SystemSettings.exe 2>nul
 
 echo ####### %0 #######
+GOTO END
 
+:USAGE
+echo "usage: %0 <R> <G> <B>"
+echo.
+
+:END
diff --git a/tools/logon.cmd b/tools/logon.cmd
index d754565..a143083 100644
--- a/tools/logon.cmd
+++ b/tools/logon.cmd
@@ -36,7 +36,7 @@ rem ===================
 echo.
 echo searching for SCRIPT settings ...
 if NOT EXIST %SCRIPT_SETTINGS% (
-  echo INFO: config file %COMPANY_SETTINGS% NOT FOUND
+  echo INFO: config file %SCRIPT_SETTINGS% NOT FOUND
 ) else (
   echo OK. Loading SCRIPT settings ...
   call %SCRIPT_SETTINGS%
@@ -62,11 +62,7 @@ echo ##### GENERIC tasks and settings
 echo #####
 echo.
 
-echo Removing the 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 ...
+echo Setting desktop COLOUR ...
 %TOOLS%\setbgcol %bgcol_R% %bgcol_G% %bgcol_B%
 
 echo Starting BGInfo tool ...
@@ -93,7 +89,6 @@ if EXIST "%USERPROFILE%"\Seafile (
   attrib -S "%USERPROFILE%"\Seafile /S /D 1>nul 2>nul
 )
 
-
 rem ===================
 rem EMCLIENT LICENSING
 rem ===================
@@ -120,7 +115,6 @@ if %emclient_license% == 0 (
 
 :EMCLIENT_END
 
-
 rem =====================================================
 rem ACCOUNT TWEAKS AND CONFIG FILES (this runs only once)
 rem =====================================================
@@ -134,9 +128,9 @@ echo ##### INITIAL account setup
 echo #####
 echo.
 
-rem ===============
-rem ONLY FOR ADMINS
-rem ===============
+rem ============
+rem ADMIN RIGHTS
+rem ============
 
 isuseradmin
 if %ERRORLEVEL% == 0 (
@@ -165,6 +159,16 @@ if %ERRORLEVEL% == 0 (
 
 )
 
+rem ===========
+rem USER RIGHTS
+rem ===========
+
+rem setting Aerolite theme...
+if %install_aerolite% == 1 (
+  call %TOOLS%\scripts\modify-desktoptheme.cmd %bgcol_R% %bgcol_G% %bgcol_B%
+  echo.
+)
+
 echo Creating workspace folder ...
 mkdir "%USERPROFILE%"\workspace 1>nul 2>nul
 
@@ -270,20 +274,6 @@ reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer" ^
 reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer" ^
   /v "ShowFrequent" /t REG_DWORD /d 0 /f 1>nul
 
-rem setting Aerolite theme...
-if %install_aerolite% == 1 (
-  call %TOOLS%\scripts\modify-desktoptheme.cmd
-
-  echo Removing the 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 %bgcol_R% %bgcol_G% %bgcol_B%
-
-  echo.
-)
-
 echo.
 echo preparing the SEAFILE configuration
 echo ########################################
@@ -325,9 +315,9 @@ echo #####
 echo ##### CLEANUP
 echo #####
 
-rem ===============
-rem ONLY FOR ADMINS
-rem ===============
+rem ============
+rem ADMIN RIGHTS
+rem ============
 
 isuseradmin
 if %ERRORLEVEL% == 0 (
@@ -362,6 +352,10 @@ if %ERRORLEVEL% == 0 (
 
 ) else (
 
+  rem ===========
+  rem USER RIGHTS
+  rem ===========
+
   echo Removing accessibility tools folder ...
   rd /S /Q %STARTMENU%\Accessibility 2>nul
 
@@ -373,6 +367,10 @@ if %ERRORLEVEL% == 0 (
 
 )
 
+rem ===========
+rem USER RIGHTS
+rem ===========
+
 echo.
 echo Cleaning users home directory
 echo ########################################