diff --git a/scripts/autoconfig-all.cmd b/scripts/autoconfig-all.cmd
index bad1df8..f67d0cd 100644
--- a/scripts/autoconfig-all.cmd
+++ b/scripts/autoconfig-all.cmd
@@ -20,11 +20,9 @@ echo.
echo creating %T% ...
mkdir %T% 1>nul 2>nul
-echo.
echo cd to %SCRIPTS% ...
cd /D %SCRIPTS%
-echo.
if EXIST settings.cmd (
echo loading settings ...
@@ -86,9 +84,6 @@ echo.
call modify-powersettings.cmd
echo.
-call modify-desktoptheme.cmd
-echo.
-
call modify-taskbar.cmd
echo.
diff --git a/scripts/install-firefox.cmd b/scripts/install-firefox.cmd
index 1d44d0c..7c98272 100644
--- a/scripts/install-firefox.cmd
+++ b/scripts/install-firefox.cmd
@@ -26,12 +26,12 @@ set BITWARDENTARGET={446900e4-71c2-419f-a6a7-df9c091e268b}.xpi
echo ####### %0 #######
-@echo on
cd %SOFTWARE%
+@echo on
firefox-setup.exe /S /MaintenanceService=false /TaskbarShortcut=false /RegisterDefaultAgent=false
+@echo off
echo sleep 10 seconds ...
ping 127.0.0.1 -n 10 > NUL 2>&1
-@echo off
cd %SCRIPTS%
rem copy config ...
diff --git a/scripts/install-logonscript.cmd b/scripts/install-logonscript.cmd
index f0ef15c..086aacd 100644
--- a/scripts/install-logonscript.cmd
+++ b/scripts/install-logonscript.cmd
@@ -14,8 +14,5 @@ mklink %TARGET%\logon.cmd %TOOLS%\logon.cmd
echo create link for Startup folder on desktop ...
mklink /D "%PUBLIC%\Desktop\Startup" %TARGET%
-echo execute logon script ...
-call %TARGET%\logon.cmd
-
echo ####### %0 #######
diff --git a/scripts/modify-desktoptheme.cmd b/scripts/modify-desktoptheme.cmd
deleted file mode 100644
index bc16b2d..0000000
--- a/scripts/modify-desktoptheme.cmd
+++ /dev/null
@@ -1,19 +0,0 @@
-@echo off
-set THEMES=C:\Windows\Resources\Themes
-
-echo ####### %0 #######
-
-copy /Y config\aerolite.theme %THEMES%
-
-echo activating AEROLITE theme ...
-@echo on
-powershell -command "Start-Process %THEMES%\aerolite.theme"
-@echo off
-
-echo sleep 10 seconds ...
-ping 127.0.0.1 -n 10 > NUL 2>&1
-
-taskkill /F /IM SystemSettings.exe 2>nul
-
-echo ####### %0 #######
-
diff --git a/scripts/uninstall-edge.cmd b/scripts/uninstall-edge.cmd
index 2dd7a31..c7ea673 100644
--- a/scripts/uninstall-edge.cmd
+++ b/scripts/uninstall-edge.cmd
@@ -7,13 +7,12 @@ set INSTALLER=Application\84.0.522.52\Installer
echo ####### %0 #######
@echo on
-%EDGEROOT%\%INSTALLER%\setup.exe --uninstall --system-level --verbose-logging --force-uninstall
+%EDGEROOT%\%INSTALLER%\setup.exe --uninstall --system-level --verbose-logging --force-uninstall 2>nul
@echo off
-echo sleep 10 seconds ...
-ping 127.0.0.1 -n 10 > NUL 2>&1
+echo sleep 5 seconds ...
+ping 127.0.0.1 -n 5 >nul 2>&1
-echo.
echo cleanup ...
rd /S /Q %EDGEROOT% 2>nul
rd /S /Q %EDGEUPDATE% 2>nul
@@ -23,7 +22,6 @@ del /F "%APPDATA%\Microsoft\Windows\Start Menu\Programs\Microsoft Edge.lnk" 2>nu
del /F "%USERPROFILE%\Desktop\Microsoft Edge.lnk" 2>nul
rd /S /Q "%PROGRAMDATA%\Microsoft\EdgeUpdate" 2>nul
-echo.
echo block edge updates ...
reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\EdgeUpdate" ^
/v "DoNotUpdateToEdgeWithChromium" /d 1 /t REG_DWORD /f
diff --git a/scripts/uninstall-onedrive.cmd b/scripts/uninstall-onedrive.cmd
index d20f54d..ef6ae83 100644
--- a/scripts/uninstall-onedrive.cmd
+++ b/scripts/uninstall-onedrive.cmd
@@ -13,9 +13,9 @@ ping 127.0.0.1 -n 5 > NUL 2>&1
echo UNINSTALLING OneDrive ...
if exist %x64% (
- %x64% /uninstall
+ %x64% /uninstall 2>nul
) else (
- %x86% /uninstall
+ %x86% /uninstall 2>nul
)
echo sleep 5 seconds ...
diff --git a/scripts/unpack-7zip.cmd b/scripts/unpack-7zip.cmd
index 6b9cde1..d8d4d0e 100644
--- a/scripts/unpack-7zip.cmd
+++ b/scripts/unpack-7zip.cmd
@@ -13,11 +13,11 @@ if NOT EXIST %SOFTWARE%\%MSI% (
echo ####### %0 #######
echo unpacking 7-zip ...
-@echo on
cd %SOFTWARE%
+@echo on
msiexec /a %MSI% TARGETDIR=%T% /qn
-cd %SCRIPTS%
@echo off
+cd %SCRIPTS%
echo moving 7-zip binaries to tools folder ...
move /Y %T%\Files\7-Zip\7z.exe %TOOLS%
diff --git a/scripts/unpack-vnc.cmd b/scripts/unpack-vnc.cmd
index 99a7c7a..1531c64 100644
--- a/scripts/unpack-vnc.cmd
+++ b/scripts/unpack-vnc.cmd
@@ -13,11 +13,11 @@ if NOT EXIST %SOFTWARE%\%MSI% (
echo ####### %0 #######
echo unpacking vnc (tvnviewer) ...
-@echo on
cd %SOFTWARE%
+@echo on
msiexec /a %MSI% TARGETDIR=%T% /qn
-cd %SCRIPTS%
@echo off
+cd %SCRIPTS%
echo moving vnc binary to tools folder ...
move /Y %T%\PFiles\TightVNC\tvnviewer.exe %TOOLS%
diff --git a/scripts/unpack-zipfiles.cmd b/scripts/unpack-zipfiles.cmd
index 12e45be..599070d 100644
--- a/scripts/unpack-zipfiles.cmd
+++ b/scripts/unpack-zipfiles.cmd
@@ -34,7 +34,7 @@ for %%A in (
echo WARNING: %SOFTWARE%\%%A.zip not found!
) else (
echo unpacking %%A.zip ...
- %TOOLS%\7z e -y -aoa -o%T%\%%A %SOFTWARE%\%%A.zip
+ %TOOLS%\7z e -y -aoa -o%T%\%%A %SOFTWARE%\%%A.zip 1>nul
)
)
diff --git a/source/logmonitor.pb b/source/logmonitor.pb
index 3fdb665..c9607a6 100644
--- a/source/logmonitor.pb
+++ b/source/logmonitor.pb
@@ -4,14 +4,14 @@
; LICENSE : GPL
; AUTHOR : Michael H.G. Schmidt
; EMAIL : michael@schmidt2.de
-; DATE : 20210329
+; DATE : 20210330
; ------------------------------------------------------------
;
If ( CountProgramParameters() <> 1 )
dummy = MessageRequester("Usage:",
"logmonitor <filename>" + Chr(13) +
- " shows a logfile and print changes in realtime in a window" + Chr(13) +
+ " shows a logfile and prints changes (in realtime) in a window" + Chr(13) +
" filename : full or relative path to file",
#PB_MessageRequester_Info)
End 99
@@ -83,4 +83,4 @@ Until WaitWindowEvent() = #PB_Event_CloseWindow
; IDE Options = PureBasic 5.71 LTS (Windows - x64)
; CursorPosition = 31
; FirstLine = 6
-; EnableXP
\ No newline at end of file
+; EnableXP
diff --git a/tools/logmonitor.exe b/tools/logmonitor.exe
index 0f42bff..195d715 100644
Binary files a/tools/logmonitor.exe and b/tools/logmonitor.exe differ
diff --git a/tools/logon.cmd b/tools/logon.cmd
index 6c3e949..af33199 100644
--- a/tools/logon.cmd
+++ b/tools/logon.cmd
@@ -76,8 +76,14 @@ if NOT EXIST %LOCALSTATE%\settings.json (
if EXIST %STATUSFILE% GOTO END
-echo deploying SSH keys ...
-copy /Y %TOOLS%\personal\id*.* %USERPROFILE%\.ssh 2>nul
+if EXIST %TOOLS%\personal (
+ echo.
+ echo #####
+ echo ##### SSH KEYS
+ echo #####
+ echo.
+ copy /Y %TOOLS%\personal\id*.* %USERPROFILE%\.ssh 2>nul
+)
echo.
echo #####
@@ -132,18 +138,15 @@ echo disable notification center ...
reg add "HKEY_CURRENT_USER\SOFTWARE\Policies\Microsoft\Windows\Explorer" ^
/v "DisableNotificationCenter" /t REG_DWORD /d 1 /f 1>nul
-echo removing pinned apps from taskbar ...
-del /F /S /Q /A "%AppData%\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar\*"
-reg delete "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Taskband" /f
-
echo loading OpenShell config ...
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 restarting explorer ...
taskkill /f /im explorer.exe 2>nul
-timeout /T 2
+rem sleep 2 seconds ...
+ping 127.0.0.1 -n 2 >nul 2>&1
start explorer.exe
rem create statusfile (this block must be executed only once) ...
@@ -226,5 +229,11 @@ net start workstation 1>nul 2>nul
net config workstation
echo ####### %0 #######
-timeout /T 2
+
+if %ERRORLEVEL% NEQ 0 (
+ echo # unknown ERROR! #
+ echo ####### %0 #######
+ echo.
+ pause
+)