.

README.md

@@ -83,22 +83,21 @@ setx T c:\TEMP
 [7-ZIP Website](https://www.7-zip.org)
 
 Download: https://www.7-zip.org/a/7z1900-x64.exe  
-Save the executable as "7z-setup.exe" in folder "software".
+Save the MSI file as "7z-setup.msi" in your home folder.
 
-Execute the self extracting file:
+Unpack the MSI with:
 ```dos
-software\7z-setup.exe
+cd /D %USERPROFILE%
+msiexec /a 7z-setup.msi TARGETDIR=%T%
 
 ```
 
-Save the contents to: c:\temp.
-
 After extracting execute:
 ```dos
-move /Y %T%\7z.exe %TOOLS%
+move /Y %T%\Files\7-Zip\7z.exe %TOOLS%
-move /Y %T%\7z.dll %TOOLS%
+move /Y %T%\Files\7-zip\7z.dll %TOOLS%
-del /S /Q /A %T%\*.* 1>nul
+del /S /Q /A %T%\7z-setup.msi 1>nul 2>nul
-rd /S /Q %T%\Lang
+rd /S /Q %T%\Files
 
 ```
 

scripts/autoconfig-all.cmd

@@ -31,6 +31,20 @@ rem echo DISABLE firewall ...
 rem netsh advfirewall set allprofiles state off
 rem echo.
 
+rem 7-zip is essential for other scripts ...
+call unpack-7zip.cmd
+echo.
+
+rem windows update blocker is in the zipfiles ...
+call unpack-zipfiles.cmd
+echo.
+
+rem copy some other stuff ...
+call copy-exefiles.cmd
+echo.
+
+
+
 rem this must be done EARLY!
 call disable-updates.cmd 
 echo.
@@ -77,9 +91,6 @@ echo ### INSTALL tasks ###
 echo #####################
 echo.
 
-call install-zipfiles.cmd
-echo.
-
 call install-tweaks.cmd
 echo.
 
@@ -101,6 +112,12 @@ echo.
 call install-purebasic.cmd
 echo.
 
+call install-go.cmd
+echo.
+
+call install-python.cmd
+echo.
+
 rem fuck you microsoft ...
 call install-openshell.cmd
 echo.
@@ -124,18 +141,24 @@ echo.
 call install-vlc.cmd
 echo.
 
+call install-vnc.cmd
+echo.
+
 call install-virtualbox.cmd
 echo.
 
 call install-antivir.cmd
 echo.
 
-call install-desktopicons.cmd
+call install-desktoplinks.cmd
 echo.
 
 call install-logonscript.cmd
 echo.
 
+call install-dbbrowser.cmd
+echo.
+
 echo #####################
 echo ### DISABLE tasks ###
 echo #####################

scripts/copy-exefiles.cmd

@@ -0,0 +1,24 @@
+@echo off
+
+set TOOLS=c:\tools
+set SOFTWARE=..\software
+
+echo ####### %0 #######
+
+for %%E in (
+  
+  snapshot64
+  puttygen
+
+) do (
+  
+  if NOT EXIST %SOFTWARE%\%%E.exe (
+    echo WARNING: %SOFTWARE%\%%E.exe not found!
+  ) else (
+    echo copy %%E.exe to %TOOLS% ...
+    copy /Y %SOFTWARE%\%%E.exe %TOOLS%
+  )
+
+)
+
+echo ####### %0 #######

scripts/install-dbbrowser.cmd

@@ -0,0 +1,24 @@
+@echo off
+
+set SCRIPTS=..\scripts
+set SOFTWARE=..\software
+set MSI=dbbrowser-setup.msi
+
+if NOT EXIST %SOFTWARE%\%MSI% (
+  echo ERROR: %SOFTWARE%\%MSI% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+cd %SOFTWARE%
+@echo on
+msiexec /i %MSI% /passive
+@echo off
+cd %SCRIPTS%
+
+rem copy icon to desktop ...
+copy /Y "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\DB Browser*" ^
+  %PUBLIC%\Desktop\DB-Browser.lnk
+
+echo ####### %0 #######

scripts/install-desktoplinks.cmd

@@ -1,6 +1,6 @@
 @echo off
 
-set SOURCE=icons
+set SOURCE=links
 set TARGET=%PUBLIC%\Desktop
 
 echo ####### %0 #######

scripts/install-emclient.cmd

@@ -13,16 +13,16 @@ echo ####### %0 #######
 
 cd %SOFTWARE%
 @echo on
-msiexec /i %MSI% /quiet 
+msiexec /i %MSI% /quiet
 @echo off
 cd %SCRIPTS%
 
-rem create icon on desktop ...
+rem copy link to desktop ...
 copy /Y "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\eM Client.lnk" ^
   %PUBLIC%\Desktop
 
 rem remove autostart for em-Client ...
-reg delete "HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" /v "eM Client" /f
+reg delete "HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" ^
+  /v "eM Client" /f
 
 echo ####### %0 #######
-

scripts/install-far.cmd

@@ -13,10 +13,12 @@ echo ####### %0 #######
 
 cd %SOFTWARE%
 @echo on
-msiexec /x %MSI% /passive
 msiexec /i %MSI% INSTALLDIR="%ProgramFiles%\FarManager" /passive
 @echo off
 cd %SCRIPTS%
 
-echo ####### %0 #######
+rem copy link to desktop ...
+copy /Y "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\Far Manager 3 x64\Far*" ^
+  %PUBLIC%\Desktop
 
+echo ####### %0 #######

scripts/install-go.cmd

@@ -0,0 +1,20 @@
+@echo off
+
+set SCRIPTS=..\scripts
+set SOFTWARE=..\software
+set MSI=go-setup.msi
+
+if NOT EXIST %SOFTWARE%\%MSI% (
+  echo ERROR: %SOFTWARE%\%MSI% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+cd %SOFTWARE%
+@echo on
+msiexec /i %MSI% /passive
+@echo off
+cd %SCRIPTS%
+
+echo ####### %0 #######

scripts/install-purebasic.cmd

@@ -5,12 +5,16 @@ set EXE=..\software\purebasic-setup.exe
 
 echo ####### %0 #######
 
-echo killing ssh processes...
+echo killing PureBasic processes...
 taskkill /F /IM PureBasic.exe 2>nul
 taskkill /F /IM pbcompiler.exe 2>nul
 
 echo installing PUREBASIC ...
 %EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS
 
+rem copy link to desktop ...
+copy /Y "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\PureBasic\PureBasic (x64).lnk" ^
+  %PUBLIC%\Desktop
+
 echo ####### %0 #######
 

scripts/install-python.cmd

@@ -0,0 +1,20 @@
+@echo off
+
+set SCRIPTS=..\scripts
+set SOFTWARE=..\software
+set MSI=python-setup.msi
+
+if NOT EXIST %SOFTWARE%\%MSI% (
+  echo ERROR: %SOFTWARE%\%MSI% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+cd %SOFTWARE%
+@echo on
+msiexec /i %MSI% /passive
+@echo off
+cd %SCRIPTS%
+
+echo ####### %0 #######

scripts/install-vscode.cmd

@@ -1,7 +1,7 @@
 @echo off
 
 set CONFIG=config\install-vscode.txt
-set EXE=..\software\VSCodeSetup-x64-1.53.2.exe
+set EXE=..\software\vscode-setup.exe
 
 if NOT EXIST %EXE% (
   echo ERROR: %EXE% not found!

scripts/modify-path.cmd

@@ -1,6 +1,16 @@
 @echo off
 
-set newPATH=%SYSTEMROOT%;%SYSTEMROOT%\system32;%SYSTEMROOT%\system32\wbem;%SYSTEMROOT%\system32\WindowsPowerShell\v1.0;%LOCALAPPDATA%\Microsoft\WindowsApps;%TOOLS%;%TOOLS%\notepad++;%TOOLS%\git\bin;%TOOLS%\git\usr\bin;%ProgramFiles%\PureBasic\Compilers;%ProgramFiles%\FarManager
+set newPATH=%SYSTEMROOT%;%SYSTEMROOT%\system32;^
+%SYSTEMROOT%\system32\wbem;^
+%SYSTEMROOT%\system32\WindowsPowerShell\v1.0;^
+%LOCALAPPDATA%\Microsoft\WindowsApps;^
+%TOOLS%;^
+%TOOLS%\git\bin;^
+%TOOLS%\git\usr\bin;^
+%ProgramFiles%\PureBasic\Compilers;^
+%ProgramFiles%\Go\bin;^
+%SystemDrive%\Python27;^
+%ProgramFiles%\FarManager
 
 echo ####### %0 #######
 
@@ -12,4 +22,3 @@ setx PATH "%newPATH%"
 set PATH=%newPATH%
 
 echo ####### %0 #######
-

scripts/modify-taskbar.cmd

@@ -10,6 +10,7 @@ echo remove store icon from taskbar ...
 reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Explorer" ^
   /v "NoPinningStoreToTaskbar" /t REG_DWORD /d 1 /f 1>nul
 
+echo remove defender icon from systray ...
 reg delete "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" ^
   /v "SecurityHealth" /f 1>nul 2>nul
 taskkill /f /im SecurityHealthSystray.exe 1>nul 2>nul

scripts/unpack-7zip.cmd

@@ -0,0 +1,28 @@
+@echo off
+
+set SCRIPTS=..\scripts
+set SOFTWARE=..\software
+set T=c:\TEMP
+set MSI=7z-setup.msi
+
+if NOT EXIST %SOFTWARE%\%MSI% (
+  echo ERROR: %SOFTWARE%\%MSI% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo unpacking 7-zip ...
+@echo on
+cd %SOFTWARE%
+msiexec /a %MSI% TARGETDIR=%T% /qn
+cd %SCRIPTS%
+@echo off
+
+echo moving 7-zip binaries to tools folder ...
+move /Y %T%\Files\7-Zip\7z.exe %TOOLS%
+move /Y %T%\Files\7-zip\7z.dll %TOOLS%
+del /S /Q /A %T%\%MSI% 1>nul 2>nul
+rd /S /Q %T%\Files
+
+echo ####### %0 #######

scripts/unpack-vnc.cmd

@@ -0,0 +1,30 @@
+@echo off
+
+set SCRIPTS=..\scripts
+set SOFTWARE=..\software
+set T=c:\TEMP
+set MSI=vnc-setup.msi
+
+if NOT EXIST %SOFTWARE%\%MSI% (
+  echo ERROR: %SOFTWARE%\%MSI% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo unpacking vnc (tvnviewer) ...
+@echo on
+cd %SOFTWARE%
+msiexec /a %MSI% TARGETDIR=%T% /qn
+cd %SCRIPTS%
+@echo off
+
+echo moving vnc binary to tools folder ...
+move /Y %T%\PFiles\TightVNC\tvnviewer.exe %TOOLS%
+del /S /Q /A %T%\%MSI% 1>nul 2>nul
+rd /S /Q %T%\PFiles
+
+rem create symbolic link ...
+mklink %TOOLS%\tvnviewer.exe %TOOLS%\vnc.exe 2>nul
+
+echo ####### %0 #######

scripts/unpack-zipfiles.cmd

@@ -25,13 +25,13 @@ for %%A in (
 
 ) do (
   
-  if NOT EXIST %SOFTWARE%\%MSI% (
+  if NOT EXIST %SOFTWARE%\%%A.zip (
     echo WARNING: %SOFTWARE%\%%A.zip not found!
+  ) else (
+    echo unpacking %%A.zip ...
+    %TOOLS%\7z e -y -aoa -o%T%\%%A %SOFTWARE%\%%A.zip
   )
 
-  echo unpacking %%A.zip ...
-  %TOOLS%\7z e -aoa -o%T%\%%A %SOFTWARE%\%%A.zip
-
 )
 
 echo.

software/basic.csv

@@ -1,4 +1,4 @@
-https://www.7-zip.org/a/7z1900-x64.exe 7z-setup.exe
+https://www.7-zip.org/a/7z1900-x64.msi 7z-setup.msi
 https://go.microsoft.com/fwlink/?linkid=2120254 adk-setup.exe
 https://download.sysinternals.com/files/BGInfo.zip bginfo.zip
 https://curl.se/windows/dl-7.75.0_3/curl-7.75.0_3-win64-mingw.zip curl.zip
@@ -11,7 +11,7 @@ https://github.com/Open-Shell/Open-Shell-Menu/releases/download/v4.4.160/OpenShe
 https://the.earth.li/~sgtatham/putty/latest/w64/puttygen.exe puttygen.exe
 https://downloads.rclone.org/v1.54.0/rclone-v1.54.0-windows-amd64.zip rclone.zip
 https://github.com/restic/restic/releases/download/v0.12.0/restic_0.12.0_windows_amd64.zip restic.zip
-https://www.tightvnc.com/download/2.8.59/tightvnc-2.8.59-gpl-setup-64bit.msi tvnc-setup.msi
+https://www.tightvnc.com/download/2.8.59/tightvnc-2.8.59-gpl-setup-64bit.msi vnc-setup.msi
 https://ftp.nluug.nl/pub/vim/pc/vim82w32.zip vim.zip
 https://winscp.net/download/WinSCP-5.17.10-Portable.zip winscp.zip
-https://www.sordum.org/files/downloads.php?st-windows-update-blocker wub.zip
+https://www.sordum.org/files/downloads.php?st-windows-update-blocker wub.zip