diff --git a/autoinstall/ctm-finance b/autoinstall/ctm-finance index fc402ed..772edc8 100644 --- a/autoinstall/ctm-finance +++ b/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" diff --git a/autoinstall/ctm-journals b/autoinstall/ctm-journals index bace13b..5b39ea8 100644 --- a/autoinstall/ctm-journals +++ b/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" diff --git a/autoinstall/ctm-monitor b/autoinstall/ctm-monitor index 769e5ca..765d82d 100644 --- a/autoinstall/ctm-monitor +++ b/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" diff --git a/autoinstall/ctm-report b/autoinstall/ctm-report index a08338f..39c9669 100644 --- a/autoinstall/ctm-report +++ b/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" diff --git a/autoinstall/ctm-service b/autoinstall/ctm-service index dd2094e..17cf48e 100644 --- a/autoinstall/ctm-service +++ b/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" diff --git a/autoinstall/ved-alf b/autoinstall/ved-alf index 33d0c55..239b800 100644 --- a/autoinstall/ved-alf +++ b/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" diff --git a/autoinstall/ved-control b/autoinstall/ved-control index 36e5991..686f8b3 100644 --- a/autoinstall/ved-control +++ b/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" diff --git a/autoinstall/ved-dcl b/autoinstall/ved-dcl index d5d5598..0e87a9f 100644 --- a/autoinstall/ved-dcl +++ b/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" diff --git a/autoinstall/ved-info b/autoinstall/ved-info index 7b23ff8..48be254 100644 --- a/autoinstall/ved-info +++ b/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" diff --git a/autoinstall/ved-payments b/autoinstall/ved-payments index c0d82da..ef69b9d 100644 --- a/autoinstall/ved-payments +++ b/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" diff --git a/autoinstall/ved-sts b/autoinstall/ved-sts index e061cbb..444eba0 100644 --- a/autoinstall/ved-sts +++ b/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" diff --git a/manualinstall/daobit-cservice b/manualinstall/daobit-cservice index 57bad1b..35f4521 100644 --- a/manualinstall/daobit-cservice +++ b/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 diff --git a/manualinstall/daobit-ratlas b/manualinstall/daobit-ratlas index 16252ab..dfdd5fa 100644 --- a/manualinstall/daobit-ratlas +++ b/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 diff --git a/manualinstall/daobit-rinfo b/manualinstall/daobit-rinfo index 91f6d04..b24fe8b 100644 --- a/manualinstall/daobit-rinfo +++ b/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 diff --git a/manualinstall/daobit-rtariff b/manualinstall/daobit-rtariff index 27b4e17..385d37a 100644 --- a/manualinstall/daobit-rtariff +++ b/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