added check sha256sum for saved files

CHANGELOG

@@ -1,5 +1,8 @@
 История изменений:
 
+0.4.6:
+* добавлено автодопонение команд для bash (bash_completion)
+
 0.4.5:
 * скорректирована проверка синтаксиса скриптов
 

autoinstall/ctm-finance

@@ -6,13 +6,16 @@ export PROG_ICON="ctmfinance"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="ved_ctm"
-export BASE_PFX="ved_ctm_pfx_x86_v04"
+export BASE_PFX="ved_ctm_pfx_x86_v05"
 export WINEARCH="win32"
 export WH_WINDOWS_VER="7"
-export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8"
+export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8 vcrun2019 dotnet7 dotnetdesktop7 renderer=gdi"
 
 prepair_wine
 
+# фикс постоянного запроса обновления Windows
+get_and_set_reg_file --add 'Software\CTM\CTMSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
 AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_fn.exe"
 AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_fn"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_fn/setup.exe"

autoinstall/ctm-journals

@@ -6,13 +6,16 @@ export PROG_ICON="ctmjournals"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="ved_ctm"
-export BASE_PFX="ved_ctm_pfx_x86_v04"
+export BASE_PFX="ved_ctm_pfx_x86_v05"
 export WINEARCH="win32"
 export WH_WINDOWS_VER="7"
-export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8"
+export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8 vcrun2019 dotnet7 dotnetdesktop7 renderer=gdi"
 
 prepair_wine
 
+# фикс постоянного запроса обновления Windows
+get_and_set_reg_file --add 'Software\CTM\CTMSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
 AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_jr.exe"
 AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_jr"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_jr/setup.exe"

autoinstall/ctm-monitor

@@ -6,13 +6,16 @@ export PROG_ICON="ctmmonitor"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="ved_ctm"
-export BASE_PFX="ved_ctm_pfx_x86_v04"
+export BASE_PFX="ved_ctm_pfx_x86_v05"
 export WINEARCH="win32"
 export WH_WINDOWS_VER="7"
-export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8"
+export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8 vcrun2019 dotnet7 dotnetdesktop7 renderer=gdi"
 
 prepair_wine
 
+# фикс постоянного запроса обновления Windows
+get_and_set_reg_file --add 'Software\CTM\CTMSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
 AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_me.exe"
 AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_me"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_me/setup.exe"

autoinstall/ctm-report

@@ -6,13 +6,16 @@ export PROG_ICON="ctmreport"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="ved_ctm"
-export BASE_PFX="ved_ctm_pfx_x86_v04"
+export BASE_PFX="ved_ctm_pfx_x86_v05"
 export WINEARCH="win32"
 export WH_WINDOWS_VER="7"
-export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8"
+export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8 vcrun2019 dotnet7 dotnetdesktop7 renderer=gdi"
 
 prepair_wine
 
+# фикс постоянного запроса обновления Windows
+get_and_set_reg_file --add 'Software\CTM\CTMSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
 AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_rp.exe"
 AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_rp"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_rp/setup.exe"

autoinstall/ctm-service

@@ -6,13 +6,16 @@ export PROG_ICON="ctmservice"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="ved_ctm"
-export BASE_PFX="ved_ctm_pfx_x86_v04"
+export BASE_PFX="ved_ctm_pfx_x86_v05"
 export WINEARCH="win32"
 export WH_WINDOWS_VER="7"
-export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8"
+export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8 vcrun2019 dotnet7 dotnetdesktop7 renderer=gdi"
 
 prepair_wine
 
+# фикс постоянного запроса обновления Windows
+get_and_set_reg_file --add 'Software\CTM\CTMSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
 AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_cs.exe"
 AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_cs"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_cs/setup.exe"

autoinstall/spravki-bk

@@ -9,6 +9,7 @@ export BASE_PFX="spravkibk_pfx_x86_v03"
 export WH_WINDOWS_VER="10"
 export WINEARCH="win32"
 export INSTALL_DLL="msxml3 msxml6 dotnet35sp1 renderer=gdi"
+export WH_USE_EXTRA_FONTS="1"
 
 AUTOINSTALL_EXE="${WH_TMP_DIR}/СПО-Справки-БК-(версия-2.5.5)-от-31.01.2024.zip"
 AUTOINSTALL_UNPACK="${WH_TMP_DIR}/SpravkiBk"

autoinstall/ved-alf

@@ -6,13 +6,16 @@ export PROG_ICON="vedalf"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="ved_ctm"
-export BASE_PFX="ved_ctm_pfx_x86_v04"
+export BASE_PFX="ved_ctm_pfx_x86_v05"
 export WINEARCH="win32"
 export WH_WINDOWS_VER="7"
-export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8"
+export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8 vcrun2019 dotnet7 dotnetdesktop7 renderer=gdi"
 
 prepair_wine
 
+# фикс постоянного запроса обновления Windows
+get_and_set_reg_file --add 'Software\CTM\CTMSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
 AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_al.exe"
 AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_al"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_al/setup.exe"

autoinstall/ved-control

@@ -6,13 +6,16 @@ export PROG_ICON="vedcontrol"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="ved_ctm"
-export BASE_PFX="ved_ctm_pfx_x86_v04"
+export BASE_PFX="ved_ctm_pfx_x86_v05"
 export WINEARCH="win32"
 export WH_WINDOWS_VER="7"
-export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8"
+export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8 vcrun2019 dotnet7 dotnetdesktop7 renderer=gdi"
 
 prepair_wine
 
+# фикс постоянного запроса обновления Windows
+get_and_set_reg_file --add 'Software\CTM\CTMSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
 AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_cl.exe"
 AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_cl"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_cl/setup.exe"

autoinstall/ved-dcl

@@ -6,13 +6,16 @@ export PROG_ICON="veddcl"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="ved_ctm"
-export BASE_PFX="ved_ctm_pfx_x86_v04"
+export BASE_PFX="ved_ctm_pfx_x86_v05"
 export WINEARCH="win32"
 export WH_WINDOWS_VER="7"
-export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8"
+export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8 vcrun2019 dotnet7 dotnetdesktop7 renderer=gdi"
 
 prepair_wine
 
+# фикс постоянного запроса обновления Windows
+get_and_set_reg_file --add 'Software\CTM\CTMSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
 AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_dl.exe"
 AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_dl"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_dl/setup.exe"

autoinstall/ved-info

@@ -6,13 +6,16 @@ export PROG_ICON="vedinfo"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="ved_ctm"
-export BASE_PFX="ved_ctm_pfx_x86_v04"
+export BASE_PFX="ved_ctm_pfx_x86_v05"
 export WINEARCH="win32"
 export WH_WINDOWS_VER="7"
-export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8"
+export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8 vcrun2019 dotnet7 dotnetdesktop7 renderer=gdi"
 
 prepair_wine
 
+# фикс постоянного запроса обновления Windows
+get_and_set_reg_file --add 'Software\CTM\CTMSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
 AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_vi.exe"
 AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_vi"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_vi/setup.exe"

autoinstall/ved-payments

@@ -6,13 +6,16 @@ export PROG_ICON="vedpayments"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="ved_ctm"
-export BASE_PFX="ved_ctm_pfx_x86_v04"
+export BASE_PFX="ved_ctm_pfx_x86_v05"
 export WINEARCH="win32"
 export WH_WINDOWS_VER="7"
-export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8"
+export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8 vcrun2019 dotnet7 dotnetdesktop7 renderer=gdi"
 
 prepair_wine
 
+# фикс постоянного запроса обновления Windows
+get_and_set_reg_file --add 'Software\CTM\CTMSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
 AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_pa.exe"
 AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_pa"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_pa/setup.exe"

autoinstall/ved-sts

@@ -6,13 +6,16 @@ export PROG_ICON="vedsts"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="ved_ctm"
-export BASE_PFX="ved_ctm_pfx_x86_v04"
+export BASE_PFX="ved_ctm_pfx_x86_v05"
 export WINEARCH="win32"
 export WH_WINDOWS_VER="7"
-export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8"
+export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8 vcrun2019 dotnet7 dotnetdesktop7 renderer=gdi"
 
 prepair_wine
 
+# фикс постоянного запроса обновления Windows
+get_and_set_reg_file --add 'Software\CTM\CTMSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
 AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_st.exe"
 AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_st"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_st/setup.exe"

manualinstall/daobit-cservice

@@ -16,6 +16,9 @@ EXE_SETUP_NAME="setup_cs.exe"
 if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then
     prepair_wine
 
+    # фикс постоянного запроса обновления Windows
+    get_and_set_reg_file --add 'Software\DAO\DAOSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
     unpack "$2" "${AUTOINSTALL_UNPACK}"
     wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\DAO\\\\CSERVICE" /auto /hide
 

manualinstall/daobit-ratlas

@@ -16,6 +16,9 @@ EXE_SETUP_NAME="setup_rk.exe"
 if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then
     prepair_wine
 
+    # фикс постоянного запроса обновления Windows
+    get_and_set_reg_file --add 'Software\DAO\DAOSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
     unpack "$2" "${AUTOINSTALL_UNPACK}"
     wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\DAO\\\\RAtlas" /auto /hide
 

manualinstall/daobit-rinfo

@@ -16,6 +16,9 @@ EXE_SETUP_NAME="setup_ri.exe"
 if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then
     prepair_wine
 
+    # фикс постоянного запроса обновления Windows
+    get_and_set_reg_file --add 'Software\DAO\DAOSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
     unpack "$2" "${AUTOINSTALL_UNPACK}"
     wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\DAO\\\\RInfo" /auto /hide
 

manualinstall/daobit-rtariff

@@ -16,6 +16,9 @@ EXE_SETUP_NAME="setup_rt.exe"
 if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then
     prepair_wine
 
+    # фикс постоянного запроса обновления Windows
+    get_and_set_reg_file --add 'Software\DAO\DAOSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
     unpack "$2" "${AUTOINSTALL_UNPACK}"
     wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\DAO\\\\RTariff" /auto /hide
 

sha256sum.list

@@ -5,6 +5,8 @@
 fb7fdfde96de10a1b3b051bdf2727b6a7c1768b878483726454dd6726e9e0193  wine-9.0.14-alt1-i586-spravkibk.tar.xz
 e0a84bb4908c3927954d7eef6b8ac7212e442b8c107d000c6890fec340f96183  wine-9.0.14-alt1-amd64.tar.xz
 6f86d2220b65b709bf88c6f829a4998de3b929cc2091cd1333a51c32e1491b79  wine-9.0.9-alt1-i586.tar.xz
+61bec1230b37b8fcc69fd45f848b44fd88cc41fcdd5dc3080336d7da63660f40  wine-7.16.1-alt1-amd64.tar.xz
+6fea17fd131f57c2ebf7ca4c60d3c5a9e819afe16e5d0b77ecb750da99ae0e38  wine-7.16.1-alt1-i586.tar.xz
 
 ##### DXVK #####
 
@@ -17,6 +19,9 @@ df1a940d2e072a884524f66a16e0f0ef74048bc6a6642b96eb257528a522109f  vkd3d-proton-1
 ##### CPCSP_PROXY #####
 3153088ff28d6af415c3504a421e5382554dbb305f38d5a87dd84df90d680421  wine-cpcsp_proxy-0.6.1-alt1.tar.xz
 
+##### FONTS #####
+405bfe3b7c7f80034837c05656535053305727ee4bf1d993521b67b71d08ebc6  extra_fonts_v01.tar.xz
+
 ##### PREFIX #####
 
 0e86cd9958d1bd1bfac99e23165a091a4ea2fa3e693c551f69aabeed5f681fea  defpfx_x86_v01.tar.xz
@@ -47,6 +52,10 @@ f4cb2f380ad8887f334c6eb3c272b343ae8de327764945266e9e74f8acbac69f  tflex17_pfx_x6
 # create with wine_x_tkg_10-0_amd64 (universal user: xuser)
 # winetricks vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8
 
+25ccbd6ac4f5e4f0f4c609a016db9251160e3559b56676d97751f870a43fe7ef  ved_ctm_pfx_x86_v05.tar.xz
+# create with wine_x_tkg_10-0_amd64 (universal user: xuser)
+# winetricks vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8 vcrun2019 dotnet7 dotnetdesktop7
+
 7ce0ff53b66bf6f3b1f8d398dddeec476a6ad9b0d0ab25cd303bf242c86c5513  alta_pfx_x86_v01.tar.xz
 # create with wine_x_tkg_10-0_amd64 (universal user: xuser)
 # winetricks isolate_home msxml6 mdac27 wsh57 jet40 vb6run mdac28 opensymbol msxml4 msxml3 native_oleaut32 eufonts mfc42 andale arial comicsans courier georgia impact times trebuchet verdana webdings corefonts tahoma lucida sourcehansans fakechinese fakejapanese fakekorean unifont cjkfonts

testinstall/abc-akkord-pro

@@ -19,7 +19,6 @@ AUTOINSTALL_EXE="${WH_TMP_DIR}/akkord_pro_${VERDATE}.exe"
 if try_download "https://abccenter.ru/wp-content/soft/akkord_pro_${VERDATE}.exe" "${AUTOINSTALL_EXE}" ; then
     wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
     try_remove_file "$AUTOINSTALL_EXE"
-    try_remove_file "$ABC_FILE"
 
     WIN_FILE_EXEC="$DRIVE_C/ABC-Soft/AKKORD PRO/ABCAKKORD.exe"
     create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"

testinstall/abc-bim-plugins

@@ -18,5 +18,4 @@ AUTOINSTALL_EXE="${WH_TMP_DIR}/ABC-BIM-Plugins-RU_${VERSION}.exe"
 if try_download "https://abccenter.ru/wp-content/soft/ABC-BIM-Plugins-RU_${VERSION}_Setup.exe" "${AUTOINSTALL_EXE}" ; then
     wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
     try_remove_file "$AUTOINSTALL_EXE"
-    try_remove_file "$ABC_FILE"
 fi

testinstall/abc-bim-ru

@@ -19,7 +19,6 @@ AUTOINSTALL_EXE="${WH_TMP_DIR}/Setup_ABC-BIM-RU_${VERDATE}_trial.exe"
 if try_download "https://abccenter.ru/wp-content/soft/Setup_ABC-BIM-RU_${VERDATE}_trial.exe" "${AUTOINSTALL_EXE}" ; then
     wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
     try_remove_file "$AUTOINSTALL_EXE"
-    try_remove_file "$ABC_FILE"
 
     WIN_FILE_EXEC="$DRIVE_C/ABC-Soft/ABC-RU/${VERSION}/Abc_win/Exec/Abc.exe"
     WIN_FILE_EXEC1="$DRIVE_C/ABC-Soft/ABC RECOMPOSER/abcrecomposerwl.exe"

testinstall/abc-dps-ru

@@ -20,7 +20,6 @@ AUTOINSTALL_EXE="${WH_TMP_DIR}/Setup_ABC_DPS_RU_${VERDATE}.exe"
 if try_download "https://abccenter.ru/wp-content/soft/Setup_ABC_DPS_RU_${VERDATE}.exe" "${AUTOINSTALL_EXE}" ; then
     wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
     try_remove_file "$AUTOINSTALL_EXE"
-    try_remove_file "$ABC_FILE"
 
     WIN_FILE_EXEC="$DRIVE_C/ABC-Soft/ABC-DPS RU/${VERSION}/ABCSpecificate.exe"
     create_desktop "$PROG_NAME RU ${VERSION}" "$WIN_FILE_EXEC" "$PROG_ICON"

testinstall/abc-erp-bim

@@ -18,7 +18,6 @@ if try_download "https://abccenter.ru/wp-content/soft/abc_erp_bim_converter.exe"
     try_copy_file "${AUTOINSTALL_EXE}" "$DRIVE_C/ABC-Soft/abc_erp_bim_converter"
 
     try_remove_file "$AUTOINSTALL_EXE"
-    try_remove_file "$ABC_FILE"
 
     WIN_FILE_EXEC="$DRIVE_C/ABC-Soft/abc_erp_bim_converter.exe"
     create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"

testinstall/abc-pir-ru

@@ -20,7 +20,6 @@ AUTOINSTALL_EXE="${WH_TMP_DIR}/Setup_ABC-PIR-RU_${VERDATE}.exe"
 if try_download "https://abccenter.ru/wp-content/soft/Setup_ABC-PIR-RU_${VERDATE}.exe" "${AUTOINSTALL_EXE}" ; then
     wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
     try_remove_file "$AUTOINSTALL_EXE"
-    try_remove_file "$ABC_FILE"
 
     WIN_FILE_EXEC="$DRIVE_C/ABC-Soft/ABC-PIR/${VERSION}RU/ABC-PIR.exe"
     create_desktop "$PROG_NAME ${VERSION}RU" "$WIN_FILE_EXEC" "$PROG_ICON"

testinstall/abc-recomposer

@@ -20,7 +20,6 @@ AUTOINSTALL_EXE="${WH_TMP_DIR}/Setup_ABC-RU_${VERDATE}.exe"
 if try_download "https://abccenter.ru/wp-content/soft/abcrecomposer_${VERDATE}.exe" "${AUTOINSTALL_EXE}" ; then
     wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
     try_remove_file "$AUTOINSTALL_EXE"
-    try_remove_file "$ABC_FILE"
 
     WIN_FILE_EXEC="$DRIVE_C/ABC-Soft/ABC RECOMPOSER/${VERSION}/abcrecomposerwl.exe"
     create_desktop "$PROG_NAME $VERSION" "$WIN_FILE_EXEC" "$PROG_ICON"

testinstall/abc-ru

@@ -20,7 +20,6 @@ AUTOINSTALL_EXE="${WH_TMP_DIR}/Setup_ABC-RU_${VERDATE}.exe"
 if try_download "https://abccenter.ru/wp-content/soft/Setup_ABC-RU_${VERDATE}.exe" "${AUTOINSTALL_EXE}" ; then
     wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
     try_remove_file "$AUTOINSTALL_EXE"
-    try_remove_file "$ABC_FILE"
 
     WIN_FILE_EXEC="$DRIVE_C/ABC-Soft/ABC-RU/${VERSION}/Abc_win/Exec/Abc.exe"
     create_desktop "$PROG_NAME $VERSION" "$WIN_FILE_EXEC" "$PROG_ICON"

testinstall/commfort-client

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+# info_ru: Локальный корпоративный чат/мессенджер с поддержкой видеоконференций.
+########################################################################
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export WINEPREFIX="commfort"
+export PROG_NAME="CommFort"
+export PROG_ICON="commfort-client"
+export WH_WINDOWS_VER="10"
+export WINEARCH="win32"
+
+AUTOINSTALL_MSI="${WH_TMP_DIR}/commfort_client.msi"
+
+prepair_wine
+if try_download "https://www.commfort.com/download/commfort_client.msi" "${AUTOINSTALL_MSI}" ; then
+    wine_run_install "${AUTOINSTALL_MSI}" /q
+    try_remove_file "$AUTOINSTALL_MSI"
+
+    WIN_FILE_EXEC="$DRIVE_C/Program Files/CommFort/CommFort.exe"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+fi

testinstall/commfort-server

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+# info_ru: (Сервер) Локальный корпоративный чат/мессенджер с поддержкой видеоконференций.
+########################################################################
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export WINEPREFIX="commfort"
+export PROG_NAME="CommFort server"
+export PROG_ICON="commfort-server"
+export WH_WINDOWS_VER="10"
+export WINEARCH="win32"
+
+PACKZIP="${WH_TMP_DIR}/commfort_server.zip"
+AUTOINSTALL_UNPACK="${WH_TMP_DIR}/commfort_server"
+AUTOINSTALL_EXE="${WH_TMP_DIR}/commfort_server/commfort_server_599.exe"
+
+prepair_wine
+if try_download "https://www.commfort.com/download/commfort_server.zip" "${PACKZIP}" ; then
+    unpack "${PACKZIP}" "$AUTOINSTALL_UNPACK"
+    wine_run_install "$AUTOINSTALL_EXE" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
+    try_remove_file "$PACKZIP"
+    try_remove_dir "$AUTOINSTALL_UNPACK"
+
+    WIN_FILE_EXEC="$DRIVE_C/Program Files/CommFort_server/CommFort_server.exe"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+fi

testinstall/rtsim

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+# info_ru: Цифровая платформа для обучения и оценки специалистов нефтегазовой отрасли.
+########################################################################
+export WH_WINE_USE="wine_x_tkg_10-0_i586"
+export PROG_NAME="РТСИМ.Карьера"
+export WINEPREFIX="rtsim"
+export PROG_ICON="rtsim"
+export WH_WINDOWS_VER="10"
+export BASE_PFX="none"
+export WINEARCH="win32"
+export INSTALL_DLL="dotnet48"
+
+AUTOINSTALL_RAR="${WH_TMP_DIR}/РТСИМ.Карьера.rar"
+AUTOINSTALL_MSI="${WH_TMP_DIR}/РТСИМ.Карьера/РТСИМ.Карьера.msi"
+
+prepair_wine
+if try_download "https://rtsim.ru/РТСИМ.Карьера.rar" "$AUTOINSTALL_RAR" ; then
+    unpack "${AUTOINSTALL_RAR}" "${WH_TMP_DIR}"
+    wine_run_install "$AUTOINSTALL_MSI" /q
+    try_remove_file "$AUTOINSTALL_RAR"
+    try_remove_dir "${WH_TMP_DIR}/РТСИМ.Карьера"
+
+    WIN_FILE_EXEC="$DRIVE_C/РТСИМ/Карьера/RTsimTrenager.exe"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+fi

testinstall/swman-modus

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+# info_ru: Программный комплекс для энергетики.
+########################################################################
+export WH_WINE_USE="wine-9.0.14-alt1-amd64"
+export WINEPREFIX="swmanmodus"
+export BASE_PFX="none"
+export WH_WINDOWS_VER="10"
+export WINEARCH="win64"
+# export INSTALL_DLL=""
+
+prepair_wine
+# Ссылка для загрузки дистрибутива меняется в зависимости от версии
+AUTOINSTALL_EXE="${WH_TMP_DIR}/modus710.msi"
+DRIVE_C_MODUS="$DRIVE_C/Program Files (x86)/Modus 7.10/bin"
+
+if try_download "https://www.swman.ru/download/710/modus710.msi" "${AUTOINSTALL_EXE}" ; then
+    wine_run_install "${AUTOINSTALL_EXE}" /q
+    try_remove_file "$AUTOINSTALL_EXE"
+
+    declare -a PROG_NAME=("Аниматор" "Диспетчер" "Графический Редактор" "Имитатор АРМ" "Просмотрщик" "Просмот Результатов" "Тренажер")
+
+    declare -a PROG_ICON=("animator" "ol" "sdedit" "swimitator" "sexplore" "resmanagdb" "simswitch")
+
+    declare -a WIN_FILE_EXEC=("${DRIVE_C_MODUS}/Animator.exe" "${DRIVE_C_MODUS}/OL.exe" "${DRIVE_C_MODUS}/Sdedit32.exe" "${DRIVE_C_MODUS}/SwImitator.exe" "${DRIVE_C_MODUS}/SExplore.exe" "${DRIVE_C_MODUS}/ResManagDB.exe" "${DRIVE_C_MODUS}/SimSwitch.exe")
+
+    for i in "${!PROG_NAME[@]}"; do
+        create_desktop "${PROG_NAME[i]}" "${WIN_FILE_EXEC[i]}" "${PROG_ICON[i]}"
+    done
+fi

winehelper

@@ -22,7 +22,8 @@ else
     # минимальная проверка синтаксиса скриптов
     for self_check_script in "$RUN_SCRIPT" \
     "$DATA_PATH/dependencies.sh" "$DATA_PATH/autoinstall"/* \
-    "$DATA_PATH/manualinstall"/* "$DATA_PATH/database"/*
+    "$DATA_PATH/manualinstall"/* "$DATA_PATH/testinstall"/* \
+    "$DATA_PATH/database"/*
     do /usr/bin/env bash -n "$self_check_script" || exit 1
     done
 fi
@@ -101,6 +102,9 @@ check_variables WH_WINE_USE "wine_x_tkg_10-0_amd64" # or system
 check_variables WH_USE_CPCSP_PROXY "0"
 check_variables CPCSP_PROXY_VER "0.6.1-alt1"
 
+check_variables WH_USE_EXTRA_FONTS "0"
+check_variables EXTRA_FONTS_VER "01"
+
 check_variables STAGING_SHARED_MEMORY "1"
 check_variables WINE_LARGE_ADDRESS_AWARE "1"
 check_variables WINE_FULLSCREEN_FSR "1"
@@ -238,6 +242,12 @@ create_new_dir () {
 }
 
 unpack () {
+    if [[ $1 == "--skip-xattr" ]] ; then
+        local skip_xattr="1"
+        shift
+    else
+        unset skip_xattr
+    fi
     print_info "Запуск распаковки архива $1"
     local command outarg
     case $1 in
@@ -245,15 +255,17 @@ unpack () {
         *.tar.gz) command="tar -xhzf" ; outarg="-C " ;;
         *.tar.zst) command="tar -I zstd -xhf" ; outarg="-C " ;;
         *.tar) command="tar -xhf" ; outarg="-C " ;;
-        *.zip|*.exe|*.rar) command="7z x -y" ; outarg="-o" ;;
+        *.zip|*.exe|*.rar) command="7z x -y -bso0" ; outarg="-o" ;;
     esac
     create_new_dir "$2"
-    if $command "$1" ${outarg}"$2" ; then
+    if [[ $skip_xattr == "1" ]] \
-        print_ok "Файл $1 распакован."
+    && $command "$1" ${outarg}"$2" 2>&1 | grep -v "xattr"
-        return 0
+    then print_ok "Файл $1 распакован."
-    else
+    elif $command "$1" ${outarg}"$2"
-        fatal "Распаковать файл $1 не удалось!"
+    then print_ok "Файл $1 распакован."
+    else fatal "Распаковать файл $1 не удалось!"
     fi
+    return 0
 }
 
 try_get_page () {
@@ -282,32 +294,47 @@ read_page () {
     fi
 }
 
-try_download () {
+check_file_sum () {
-    local DOWNLOAD_FILE_URL="${1// /%20}"
+    local sha256sum_ext sha256sum_int check_file_path check_file_name
-    local OUTPUT_FILE="$2"
+    check_file_path="$1"
-    local OUTPUT_FILE_NAME="$(basename "$OUTPUT_FILE")"
+    check_file_name="$(basename "$check_file_path")"
 
-    print_info "Скачивание файла $OUTPUT_FILE_NAME..."
+    sha256sum_ext=$(sha256sum "$check_file_path" | awk '{print $1}')
+    sha256sum_int="$(grep "$check_file_name" "$DATA_PATH/sha256sum.list" | awk '{print $1}')"
+
+    if [[ "$sha256sum_ext" == "$sha256sum_int" ]] ; then
+        print_ok "Хэш-сумма файла $check_file_name успешно проверена."
+        return 0
+    else
+        try_remove_file "$check_file_path"
+        fatal "Хэш-сумма файла $check_file_name не совподает!"
+    fi
+}
+
+try_download () {
+    local download_file_url output_file output_file_name
+    download_file_url="${1// /%20}"
+    output_file="$2"
+    output_file_name="$(basename "$output_file")"
+
+    if [[ -f "$output_file" ]] ; then
+        print_info "Файл найден: $output_file"
+        [[ $3 == "check256sum" ]] && check_file_sum "$output_file"
+        return 0
+    else
+        print_info "Скачивание файла $output_file_name..."
         if curl -f --progress-bar -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" \
-       -L "$DOWNLOAD_FILE_URL" -o "$OUTPUT_FILE"
+        -L "$download_file_url" -o "$output_file"
         then
-        print_ok "Скачивание файла $OUTPUT_FILE_NAME прошло успешно."
+            print_ok "Скачивание файла $output_file_name прошло успешно."
-        if [[ "$3" == check256sum ]] ; then
+            [[ $3 == "check256sum" ]] && check_file_sum "$output_file"
-            SHA256SUM_EXT=$(sha256sum "$OUTPUT_FILE" | awk '{print $1}')
-            SHA256SUM_INT="$(grep "$OUTPUT_FILE_NAME" "$DATA_PATH/sha256sum.list" | awk '{print $1}')"
-            if [[ "$SHA256SUM_EXT" == "$SHA256SUM_INT" ]] ; then
-                print_ok "Хэш-сумма файла $OUTPUT_FILE_NAME успешно проверена."
             return 0
         else
-                fatal "Хэш-сумма файла $OUTPUT_FILE_NAME не совподает!"
+            try_remove_file "$output_file"
+            fatal "Скачивание файла: $output_file_name завершилось с ошибкой!"
             return 1
         fi
     fi
-        return 0
-    else
-        fatal "Скачивание файла: $OUTPUT_FILE_NAME завершилось с ошибкой!"
-        return 1
-    fi
 }
 
 try_copy_other_dll_to_pfx_64 () {
@@ -669,13 +696,13 @@ init_wine_ver () {
         if [[ ! -d "$WINEDIR" ]] ; then
             WINE_URL="$CLOUD_URL/$WH_WINE_USE.tar.xz"
             local WINE_PACKAGE="$WH_TMP_DIR/${WH_WINE_USE}.tar.xz"
-            if try_download "$WINE_URL" "$WINE_PACKAGE" check256sum ; then
+            if try_download "$WINE_URL" "$WINE_PACKAGE" check256sum \
-                if unpack "$WINE_PACKAGE" "$WH_DIST_DIR/" ; then
+            && unpack "$WINE_PACKAGE" "$WH_DIST_DIR/"
+            then
                 echo "$WH_WINE_USE" > "$WH_DIST_DIR/$WH_WINE_USE/version"
                 try_remove_file "$WINE_PACKAGE"
             fi
         fi
-        fi
 
         export WINE="${WINEDIR}/bin/wine"
         export WINELOADER="${WINEDIR}/bin/wine"
@@ -718,15 +745,8 @@ init_wine_ver () {
             CPCSP_PROXY_NAME="wine-cpcsp_proxy-$CPCSP_PROXY_VER"
             CPCSP_PROXY_URL="$CLOUD_URL/$CPCSP_PROXY_NAME.tar.xz"
 
-            if [[ ! -f "$WH_TMP_DIR/$CPCSP_PROXY_NAME" ]] ; then
+            try_download "$CPCSP_PROXY_URL" "$WH_TMP_DIR/$CPCSP_PROXY_NAME.tar.xz" check256sum
-                print_info "Загрузка $CPCSP_PROXY_NAME.tar.xz"
-                if try_download "$CPCSP_PROXY_URL" "$WH_TMP_DIR/$CPCSP_PROXY_NAME.tar.xz" check256sum
-                then unpack "$WH_TMP_DIR/$CPCSP_PROXY_NAME.tar.xz" "$WH_TMP_DIR"
-                else try_remove_file "$WH_TMP_DIR/$CPCSP_PROXY_NAME.tar.xz"
-                fi
-            else
             unpack "$WH_TMP_DIR/$CPCSP_PROXY_NAME.tar.xz" "$WH_TMP_DIR"
-            fi
 
             cp -fr "$WH_TMP_DIR/$CPCSP_PROXY_NAME/"i386-* "${WINEDIR}/lib/wine/"
             if [[ -d "${WINEDIR}/lib64" ]] ; then
@@ -737,7 +757,7 @@ init_wine_ver () {
         fi
     else
         # use system WINE
-        if ! command -v "wine" &>/dev/null ; then
+        if ! rpm -q "wine" 1>/dev/null ; then
             fatal "system WINE - not found."
         fi
         export WINEDIR="/usr"
@@ -861,23 +881,15 @@ wait_wineserver () {
 }
 
 get_base_pfx () {
-    local FILE_NAME_PFX="$1"
+    local pfx_file_name pfx_file_url pfx_tmp_path
-    local PFX_URL="$CLOUD_URL/${FILE_NAME_PFX}.tar.xz"
+    pfx_file_name="${1}.tar.xz"
-    local PFX_TMP="$WH_TMP_DIR/pfx"
+    pfx_file_url="$CLOUD_URL/$pfx_file_name"
-    create_new_dir "$PFX_TMP"
+    pfx_tmp_path="$WH_TMP_DIR/pfx"
 
-    if [[ ! -f "$PFX_TMP/$FILE_NAME_PFX.tar.xz" ]] ; then
+    create_new_dir "$pfx_tmp_path"
-        print_info "Загрузка базового префикса: ${FILE_NAME_PFX}"
+    print_info "Загрузка архива базового префикса: $pfx_file_name"
-        if try_download "$PFX_URL" "$PFX_TMP/$FILE_NAME_PFX.tar.xz" check256sum
+    try_download "$pfx_file_url" "$pfx_tmp_path/$pfx_file_name" check256sum
-        then unpack "$PFX_TMP/$FILE_NAME_PFX.tar.xz" "$WINEPREFIX/"
+    unpack --skip-xattr "$pfx_tmp_path/$pfx_file_name" "$WINEPREFIX/"
-        else try_remove_file "$PFX_TMP/$FILE_NAME_PFX.tar.xz"
-        fi
-    else
-        if ! unpack "$PFX_TMP/$FILE_NAME_PFX.tar.xz" "$WINEPREFIX/" ; then
-            try_remove_file "${PFX_TMP}/${FILE_NAME_PFX}.tar.xz"
-            get_base_pfx "$FILE_NAME_PFX"
-        fi
-    fi
 }
 
 check_prefix_var () {
@@ -1061,6 +1073,22 @@ init_wineprefix () {
         fi
     fi
 
+    # Устанавливаем дополнительные шрифты (включая штрих-код)
+    local fonts_dir="$DRIVE_C/windows/Fonts"
+    local x_fonts_name="extra_fonts_v${EXTRA_FONTS_VER}"
+
+    if [[ $WH_USE_EXTRA_FONTS == "1" ]] \
+    && [[ ! -e "$fonts_dir/${x_fonts_name}.installed" ]]
+    then
+        local x_fonts_url="$CLOUD_URL/${x_fonts_name}.tar.xz"
+        local x_fonts_tar="$WH_TMP_DIR/${x_fonts_name}.tar.xz"
+
+        print_info "Устанавливаем дополнительные шрифты..."
+        try_download "$x_fonts_url" "$x_fonts_tar" check256sum
+        unpack "$x_fonts_tar" "$fonts_dir/"
+        touch "$fonts_dir/${x_fonts_name}.installed"
+    fi
+
     echo "# переменные последнего использования префикса:" > "$WINEPREFIX/last.conf"
     for var in WH_WINE_USE BASE_PFX WINEARCH WH_WINDOWS_VER WINEESYNC WINEFSYNC \
     STAGING_SHARED_MEMORY WINE_LARGE_ADDRESS_AWARE WH_USE_SHADER_CACHE WH_USE_WINE_DXGI \
@@ -1369,6 +1397,55 @@ remove_winehelper () {
     fi
 }
 
+create_base_pfx () {
+    export WINEPREFIX="$1"
+    check_prefix_var
+
+    local prefix_dir="$WINEPREFIX"
+    local drive_c_dir="$prefix_dir/drive_c"
+    local users_dir="$drive_c_dir/users"
+    local archive_path="$WH_TMP_DIR/pfx/new_${PREFIX_NAME}.tar.xz"
+
+    try_copy_dir "$prefix_dir" "${prefix_dir}_bak"
+
+    for wtlog in workaround isolate internal winxp win2 win7 win10
+    do sed -i "/$wtlog/d" "$prefix_dir/winetricks.log"
+    done
+
+    if [[ -d "$users_dir/$USER" ]] \
+    && [[ ! -L "$users_dir/$USER" ]]
+    then
+        if [[ -L "$users_dir/xuser" ]]
+        then try_remove_dir "$users_dir/xuser/"
+        fi
+        create_new_dir "$users_dir/xuser/"
+        cp -fr "$users_dir/$USER"/* "$users_dir/xuser/"
+    fi
+
+    try_remove_file "$prefix_dir/.update-timestamp"
+    try_remove_file "$prefix_dir/.firstboot"
+    try_remove_file "$prefix_dir/last.conf"
+    try_remove_dir "$prefix_dir/dosdevices/"
+    try_remove_dir "$users_dir/$USER"
+    try_remove_dir "$users_dir/xuser/AppData/Local/Temp/"
+    try_remove_dir "$drive_c_dir/ProgramData/Package Cache/"
+    try_remove_dir "$drive_c_dir/windows/temp/"
+    try_remove_dir "$drive_c_dir/windows/Installer/"
+
+    rm -fr "$drive_c_dir/windows/Microsoft.NET"/*/*/SetupCache/
+
+    cd "$prefix_dir"
+    if tar --no-xattrs -c -I 'xz --memlimit=8000MiB -9 -T0' -f "$archive_path" ./* ; then
+        print_ok "Архив создан по пути: $archive_path"
+        xdg-open "$(dirname "$archive_path")" &
+        cd -
+    else
+        try_remove_file "$archive_path"
+        cd -
+        fatal "Не удалось создать архив."
+    fi
+}
+
 backup_prefix() {
     export WINEPREFIX="$1"
     check_prefix_var
@@ -1576,7 +1653,7 @@ case "$arg1" in
     winereg|regedit) prepair_wine ; wine_run "regedit" ;;
     winefile|explorer) prepair_wine ; wine_run "winefile" ;;
     wineconsole|cmd) prepair_wine ; wine_run "wineconsole" ;;
-    winetricks) prepair_wine ; "$WINETRICKS" -q "$@" ;;
+    winetricks) prepair_wine ; "$WH_WINETRICKS" -q "$@" ;;
     desktop) create_desktop "$@" ; exit 0 ;;
     install|-i) run_autoinstall "$@" ;;
     installed) check_installed_programs "$1" ;;
@@ -1585,6 +1662,7 @@ case "$arg1" in
     restore-prefix) restore_prefix "$@" ;;
     remove-all) remove_winehelper "$@" ;;
     remove-prefix) remove_prefix "$@" ;;
+    create-base-pfx) create_base_pfx "$@" ;;
     *)
         if [[ -f "$arg1" ]] ; then
             WIN_FILE_EXEC="$(readlink -f "$arg1")"