added some links, added java install script, added bfg

.gitignore

@@ -9,4 +9,5 @@ Packages.txt
 distribution
 SOFTWAREBKP
 tmp/*
+personal/*
 

optional/install-java.cmd

@@ -0,0 +1,19 @@
+@echo off
+
+set CONFIG=config\install-java.txt
+set EXE=..\software\java-setup.exe
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo installing JAVA ...
+start /wait %EXE% INSTALL_SILENT=Enable AUTO_UPDATE=0 NOSTARTMENU=1 REBOOT=0 ^
+  INSTALLDIR="%ProgramFiles%\java"
+
+echo ####### %0 #######
+pause
+

optional/install-softmaker.cmd

@@ -3,12 +3,24 @@
 set OPT=..\optional
 set SOFTWARE=..\software
 set MSI=softmaker-setup.msi 
+set SETTINGS=..\personal\settings.cmd
+set softmaker_license=0
 
 if NOT EXIST %SOFTWARE%\%MSI% (
   echo ERROR: %SOFTWARE%\%MSI% not found!
   exit /b
 )
 
+rem ===================
+rem CONFIGFILE CHECK
+rem ===================
+
+if NOT EXIST %SETTINGS% (
+  echo.
+  echo WARNING: %SETTINGS% NOT FOUND
+  echo.
+)
+
 echo ####### %0 #######
 
 cd %SOFTWARE%
@@ -30,6 +42,26 @@ copy /Y "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\Softmaker Office 20
 rem refresh desktop (W10 style)
 ie4uinit.exe -show
 
+echo disabling automatic updates for Softmaker Office 2021 ...
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\SoftMaker Office 2021" ^
+  /v "UpdateCheckEnabled" /d 0 /t REG_DWORD /f
+
+echo disabling WEB help ...
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\SoftMaker Office 2021" ^
+  /v "HelpSoftMaker" /d 0 /t REG_DWORD /f
+
+echo disabling the asking for user info ...
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\SoftMaker Office 2021" ^
+  /v "AskUserInfo" /d 0 /t REG_DWORD /f
+
+if softmaker_license == 0 (
+  echo no softmaker license found!
+) else (
+  echo adding softmaker license ...
+  reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\SoftMaker Office 2021" ^
+    /v "ProductKey" /d "115081474870" /t REG_SZ /f
+)
+
 echo ####### %0 #######
 pause
 

scripts/autoconfig-all.cmd

@@ -23,12 +23,18 @@ echo cd to %SCRIPTS% ...
 cd /D %SCRIPTS%
 echo.
 
-echo loading settings ...
+if EXIST settings.cmd (
-call settings.cmd
+  echo loading settings ...
-echo ++++++++++++++++++
+  call settings.cmd
-echo windows_updates=%windows_updates%
+  echo ++++++++++++++++++
-echo ++++++++++++++++++
+  echo windows_updates=%windows_updates%
-echo.
+  echo ++++++++++++++++++
+  echo.
+) else (
+  echo WARNING: settings.cmd not found!
+  echo setting defaults ...
+  set windows_updates=1
+)
 
 rem 7-zip is essential for other scripts ...
 call unpack-7zip.cmd
@@ -43,7 +49,7 @@ call unpack-vnc.cmd
 echo.
 
 rem copy some other stuff ...
-call copy-exefiles.cmd
+call copy-executables.cmd
 echo.
 
 echo #######################

scripts/copy-executables.cmd

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

scripts/copy-exefiles.cmd

@@ -1,24 +0,0 @@
-@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/disable-accountpicture.cmd

@@ -7,12 +7,18 @@ set LOGO=config\user-empty.png
 
 echo ####### %0 #######
 
-echo loading settings ...
+if EXIST settings.cmd (
-call settings.cmd
+  echo loading settings ...
-echo ++++++++++++++++++
+  call settings.cmd
-echo logon_logo=%logon_logo%
+  echo ++++++++++++++++++
-echo ++++++++++++++++++
+  echo logon_logo=%logon_logo%
-echo.
+  echo ++++++++++++++++++
+  echo.
+) else (
+  echo WARNING: settings.cmd not found!
+  echo setting defaults ...
+  set logon_logo=1
+)
 
 if %logon_logo% == 1 (
   rem windows logo taken from: http://pngimg.com/image/23601

scripts/modify-path.cmd

@@ -11,7 +11,7 @@ set newPATH=%SYSTEMROOT%;%SYSTEMROOT%\system32;^
 %ProgramFiles%\Go\bin;^
 %SystemDrive%\Python27;^
 %ProgramFiles%\Python39;^
-%ProgramFiles%\FarManager
+%ProgramFiles%\Java\bin
 
 echo ####### %0 #######
 

scripts/unpack-zipfiles.cmd

@@ -21,6 +21,7 @@ for %%A in (
   regscanner
   restic
   setacl
+  showkeyplus
   vim
   winscp
   wub
@@ -93,6 +94,11 @@ move /Y %T%\setacl\*.exe %TOOLS%\setacl.exe
 rd /S /Q %T%\setacl
 echo.
 
+echo ShowKeyPlus
+move /Y %T%\showkeyplus\*.exe %TOOLS%
+rd /S /Q %T%\showkeyplus
+echo.
+
 echo VIM
 move /Y %T%\vim\vim.exe %TOOLS%
 rd /S /Q %T%\vim

software/basic.csv

@@ -19,6 +19,9 @@ https://golang.org/dl/go1.16.windows-amd64.msi go-setup.msi
 https://www.python.org/ftp/python/3.9.2/python-3.9.2-amd64.exe python3-setup.exe
 https://www.nirsoft.net/utils/regscanner-x64.zip regscanner.zip
 http://www.drivesnapshot.de/download/snapshot64.exe snapshot64.exe
-https://ftp.halifax.rwth-aachen.de/videolan/vlc/3.0.12/win64/vlc-3.0.12-win64.exe vlc-setup.exe
-https://github.com/microsoft/terminal/releases/download/v1.5.10411.0/Microsoft.WindowsTerminal_1.5.10411.0_8wekyb3d8bbwe.msixbundle windowsterminal-setup.msixbundle
 https://helgeklein.com/downloads/SetACL/current/SetACL%20(executable%20version).zip setacl.zip
+https://github.com/Superfly-Inc/ShowKeyPlus/releases/download/ShowKeyPlus1.1.14.1/ShowKeyPlus1.1.14.1.zip showkeyplus.zip
+https://ftp.halifax.rwth-aachen.de/videolan/vlc/3.0.12/win64/vlc-3.0.12-win64.exe vlc-setup.exe
+https://www.heidoc.net/php/Windows-ISO-Downloader.exe Windows-ISO-Downloader.exe
+https://github.com/microsoft/terminal/releases/download/v1.5.10411.0/Microsoft.WindowsTerminal_1.5.10411.0_8wekyb3d8bbwe.msixbundle windowsterminal-setup.msixbundle
+

software/optional.csv

@@ -1,18 +1,20 @@
-https://download.sp.f-secure.com/SE/Retail/installer/F-SecureNetworkInstaller-AV.exe f-securenetworkinstaller-av_avtr20f930_.exe
+https://repo1.maven.org/maven2/com/madgag/bfg/1.14.0/bfg-1.14.0.jar bfg.jar
 https://github.com/sqlitebrowser/sqlitebrowser/releases/download/v3.12.1/DB.Browser.for.SQLite-3.12.1-win64-v2.msi dbbrowser-setup.msi
 https://www.emclient.com/dist/v8.1.1060/setup.msi emclient-setup.msi
+https://download.sp.f-secure.com/SE/Retail/installer/F-SecureNetworkInstaller-AV.exe f-securenetworkinstaller-av_avtr20f930_.exe
 https://dl.google.com/drive/gsync_enterprise64.msi gsync-setup.msi
+https://github.com/ClusterM/hakchi2/releases/download/v2.32/hakchi2.zip hakchi2.zip
 https://download3.vmware.com/software/view/viewclients/CART21FQ4/VMware-Horizon-Client-2012-8.1.0-17349995.exe horizon-setup.exe
+https://github.com/mamedev/mame/releases/download/mame0186/mame0186b_64bit.exe mame64.7z
+https://matrica.de/download/windows/moneyplex_20_setup.exe moneyplex-setup.exe
+https://www.purebasic.com/download/PureBasic_Demo_x64.zip purebasic.zip
+https://www.python.org/ftp/python/2.7.18/python-2.7.18.amd64.msi python2-setup.msi
 https://www.softmaker.net/down/ofw2021_64.msi softmaker-setup.msi
 http://download.spotify.com/SpotifyFullSetup.exe spotify-setup.exe
+https://cdn.akamai.steamstatic.com/client/installer/SteamSetup.exe steam-setup.exe
 https://statics.teams.cdn.office.net/production-windows-x64/1.4.00.2879/Teams_windows_x64.exe teams-setup.exe
 https://totalcommander.ch/win/fixed/tcmd951x64.exe totalcommander-setup.exe
 https://download.virtualbox.org/virtualbox/6.1.18/VirtualBox-6.1.18-142142-Win.exe virtualbox-setup.exe
 https://code.visualstudio.com/sha/download?build=stable&os=win32-x64 vscode-setup.exe
 https://download.xnview.com/XnViewMP-win-x64.exe xnview-setup.exe
-https://www.purebasic.com/download/PureBasic_Demo_x64.zip purebasic.zip
+
-https://matrica.de/download/windows/moneyplex_20_setup.exe moneyplex-setup.exe
-https://www.python.org/ftp/python/2.7.18/python-2.7.18.amd64.msi python2-setup.msi
-https://github.com/ClusterM/hakchi2/releases/download/v2.32/hakchi2.zip hakchi2.zip
-https://cdn.akamai.steamstatic.com/client/installer/SteamSetup.exe steam-setup.exe
-https://github.com/mamedev/mame/releases/download/mame0186/mame0186b_64bit.exe mame64.7z

software/other.csv

@@ -1,8 +1,8 @@
 dummy purebasic-setup.exe
 dummy citrixreceiver-setup.exe
 dummy xojo-setup.exe
-dummy xojo.license
 dummy pl2303-setup.exe
 dummy wfc5210-setup.exe
 dummy cyberjack-setup.exe
+dummy jre64-setup.exe
 

tools/bfg.cmd

@@ -0,0 +1,5 @@
+@echo off
+set TOOLS=c:\tools
+
+java -jar %TOOLS%\bfg.jar
+

tools/pbc.cmd

@@ -13,3 +13,4 @@ GOTO END
 echo "usage: %0 <PureBasic SOURCEFILE>"
   
 :END
+