Merge branch 'master' of gitea.exabyte-systems.com:WINDOWS/w10install

.gitignore

@@ -10,4 +10,5 @@ distribution
 SOFTWAREBKP
 tmp/
 temp/
+custom/
 

06_Copy2Media.cmd

@@ -77,6 +77,10 @@ for %%P in (drivers scripts source optional personal apps custom) do (
   )
 )
 
+echo.
+echo deleting ftpsettings.cmd ...
+del /F /Q %DRIVE%\tools\custom\ftpsettings.cmd
+
 echo.
 echo copying autoconfig starter script to %DRIVE% ...
 copy /Y image\StartAutoConfig.cmd %DRIVE%\
@@ -106,10 +110,6 @@ if EXIST %DRIVE%\tools\%SNAPCONTROL_INI% (
   tools\searchreplace %DRIVE%\tools\%SNAPCONTROL_INI% "^.*MAILPASS.*=.*" "MailPass = DELETED"
 )
 
-echo.
-echo deleting ftpsettings.cmd ...
-del /F /Q %DRIVE%\tools\custom\ftpsettings.cmd
-
 echo.
 echo ======
 echo READY.

optional/config/snapcontrol.ini

@@ -1,12 +1,12 @@
 ; SNAPCONTROL config file.
-; https://gitea.exabyte-systems.com/WINDOWS/snapcontrol
+; https://gitea.exabyte-systems.com/WINDOWS/snapcontrol.git
 ;
 ; This tool creates an image backups of windows machines,
 ; it uses the Drive Snapshot tool by Tom Ehlert Software.
 ; Please support this great tool and buy a license.
 ; http://www.drivesnapshot.de/en/order.htm
 ;
-; Copyright (c) 2019-2021 Michael H.G. Schmidt
+; Copyright (c) 2019-2024 Michael H.G. Schmidt
 ; EMAIL: michael@schmidt2.de
 ; Released under the MIT license.
 ;
@@ -14,7 +14,8 @@
 ;
 
 [BACKUP]
-; path where snapshot.exe and cmail.exe is located ...
+; path where cmail.exe is located ...
+; (snaphot64.exe, this inifile and snapcontrol.exe  must be always located in %WINDIR%!)
 BinPath = c:\tools
 
 ; target PATH examples:
@@ -80,6 +81,9 @@ EjectMedia = yes
 ; should we ask for a shutdown after backup ? (yes/no)
 AskForShutdown = yes
 
+; should we force a shutdown after the backup run?
+; user will NOT be asked for consent! (useful for schedule mode "TIME" and silent mode)
+ForcedShutdown = no
 
 [LOGGING]
 

optional/install-seafile.cmd

@@ -5,7 +5,7 @@ if %ERRORLEVEL% neq 0 exit /b
 set OPT=..\optional
 set SOFTWARE=..\software
 set MSI=seafile-setup.msi
-set CUSTOM_SETTINGS=..\customsettings.cmd
+set CUSTOM_SETTINGS=..\custom\settings.cmd
 set seafile_server_url=0
 set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
 

optional/install-snapcontrol.cmd

@@ -3,40 +3,47 @@ call check-for-admin
 if %ERRORLEVEL% neq 0 exit /b
 
 set TOOLS=%SystemDrive%\tools
-set INIFILE=..\scripts\config\snapcontrol.ini
+set INIFILE=config\snapcontrol.ini
 set SOFTWARE=..\software
+set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\tools"
+
+if NOT EXIST %SOFTWARE%\snapcontrol.exe (
+  echo ERROR: %SOFTWARE%\snapcontrol.exe not found!
+  exit /b
+)
 
 echo ####### %0 #######
 
+echo killing snapcontrol processes...
+taskkill /F /IM snapcontrol.exe 2>nul
+
+echo killing snapshot processes...
+taskkill /F /IM snapshot64.exe 2>nul
+
 echo copy snapcontrol binary to [ %windir% ] ...
 copy /Y %SOFTWARE%\snapcontrol.exe %windir% 2>nul
 
 if EXIST %SOFTWARE%\snapshot64_licensed.exe (
-
   echo copying LICENSED snapshot64 to %windir% ...
   copy /Y %SOFTWARE%\snapshot64_licensed.exe %windir%\snapshot64.exe
-
 ) else (
-
   echo copying STANDARD snapshot64 to boot image ...
-  copy /Y %SOFTWARE%\snapshot64.exe %windiw%
+  copy /Y %SOFTWARE%\snapshot64.exe %windir%
-
 )
   
 if NOT EXIST %windir%\snapcontrol.ini (
-
   echo copying STANDARD inifile to %windir% ...
   copy /Y %INIFILE% %windir%
-
 ) else (
-
   echo inifile already copied. nothing to do!
-
 )
 
 echo creating scheduler task ...
 %windir%\snapcontrol /I
 
+echo copy startmenu link ...
+copy /Y "startmenu\Drive Snapshot.lnk" %STARTMENU%
+
 echo ####### %0 #######
 pause
 

optional/install-softmaker-2024.cmd

@@ -5,7 +5,7 @@ if %ERRORLEVEL% neq 0 exit /b
 set OPT=..\optional
 set SOFTWARE=..\software
 set MSI=softmaker-setup-2024.msi 
-set CUSTOM_SETTINGS=..\customsettings.cmd
+set CUSTOM_SETTINGS=..\custom\settings.cmd
 set softmaker_license=0
 set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
 

optional/install-softmaker.cmd

@@ -5,7 +5,7 @@ if %ERRORLEVEL% neq 0 exit /b
 set OPT=..\optional
 set SOFTWARE=..\software
 set MSI=softmaker-setup.msi 
-set CUSTOM_SETTINGS=..\customsettings.cmd
+set CUSTOM_SETTINGS=..\custom\settings.cmd
 set softmaker_license=0
 set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
 

tools/adjoin.cmd

@@ -4,7 +4,7 @@ if %ERRORLEVEL% neq 0 exit /b
 
 set TOOLS=c:\tools
 set SCRIPT_SETTINGS=%TOOLS%\scripts\settings.cmd
-set CUSTOM_SETTINGS=%TOOLS%\customsettings.cmd
+set CUSTOM_SETTINGS=%TOOLS%\custom\settings.cmd
 
 echo ####### %0 #######
 

tools/block-updates.cmd

@@ -28,6 +28,11 @@ echo   [ Feature Update to Windows 10 Version 21H2 x64 ]
 powershell -command "Hide-WindowsUpdate -KBArticleID KB5034122 -AcceptAll"
 echo.
 
+echo blocking UPDATE KB5034763 ...
+echo   [ Cumulative Update for Windows 10 Version 21H2 x64 ]
+powershell -command "Hide-WindowsUpdate -KBArticleID KB5034763 -AcceptAll"
+echo.
+
 echo blocking a hardware driver ...
 echo   [ Advanced Micro Devices ]
 powershell -command "Hide-WindowsUpdate -KBArticleID 'Advanced Micro Devices, Inc. - Display - 31.0.12027.7000' -AcceptAll"

tools/personalfiles.cmd

@@ -6,7 +6,7 @@ rem ===================
 
 set TOOLS=c:\tools
 set SCRIPT_SETTINGS=%TOOLS%\scripts\settings.cmd
-set CUSTOM_SETTINGS=%TOOLS%\customsettings.cmd
+set CUSTOM_SETTINGS=%TOOLS%\custom\settings.cmd
 set PERSONALFILES_DONE=%LOCALAPPDATA%\.personalfiles_done
 set GITWORKDIR=%USERPROFILE%\workspace
 set gitrepo=undefined