From bc6000018b231b9bd07145eb7cf0739a145819ac Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Fri, 5 Dec 2025 15:51:47 +0300 Subject: [PATCH] returned prefix separation for nalog programs --- testinstall/declaration | 6 +++--- testinstall/npul | 4 ++-- testinstall/ppdgr2 | 6 +++--- testinstall/soun | 7 ++++--- testinstall/tester_n | 4 ++-- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/testinstall/declaration b/testinstall/declaration index e40c79e..532abc7 100644 --- a/testinstall/declaration +++ b/testinstall/declaration @@ -3,13 +3,13 @@ ######################################################################## export PROG_URL="https://www.nalog.gov.ru" export WH_WINE_USE="wine_x_tkg_10-0_amd64" -export WINEPREFIX="nalog" +export WINEPREFIX="declaration" export PROG_NAME="Декларация" export PROG_ICON="declarac" -export BASE_PFX="none" +export BASE_PFX="defpfx_x86_v01" export WINEARCH="win32" +export INSTALL_DLL="msxml3 msxml4 msxml6 corefonts wsh57 vcrun6 jet40 gdiplus" export WH_WINDOWS_VER="10" -export INSTALL_DLL="corefonts micross tahoma lucida riched20 comctl32 msxml3 msxml4 msxml6 mdac28 wsh57 vcrun6 vb6run jet40 gdiplus vcrun2019 dotnet20sp2 dotnet40 dotnet48" try_get_page "https://www.nalog.gov.ru/rn77/program/5961249/" VER_YEAR=$(read_page | grep -oP 'href="\K[^"]*.msi[^"]*' | awk -F'/' '{print $(NF-2)}' | head -n 1) diff --git a/testinstall/npul b/testinstall/npul index c36c1ba..163976a 100644 --- a/testinstall/npul +++ b/testinstall/npul @@ -6,10 +6,10 @@ export WH_WINE_USE="wine_x_tkg_10-0_amd64" export WINEPREFIX="nalog" export PROG_NAME="Налогоплательщик ЮЛ" export PROG_ICON="npul" -export BASE_PFX="none" +export BASE_PFX="defpfx_x86_v01" export WINEARCH="win32" +export INSTALL_DLL="msxml3 msxml4 msxml6 corefonts wsh57 vcrun6 jet40 gdiplus" export WH_WINDOWS_VER="10" -export INSTALL_DLL="corefonts micross tahoma lucida riched20 comctl32 msxml3 msxml4 msxml6 mdac28 wsh57 vcrun6 vb6run jet40 gdiplus vcrun2019 dotnet20sp2 dotnet40 dotnet48" try_get_page "https://data.nalog.ru/rn77/program/5961229/" VER_MSI=$(read_page | grep -oP 'NalogUL\d+\.msi' | tail -1 | grep -oP '\d+') diff --git a/testinstall/ppdgr2 b/testinstall/ppdgr2 index dd6b5ce..e33a5b0 100644 --- a/testinstall/ppdgr2 +++ b/testinstall/ppdgr2 @@ -3,14 +3,14 @@ ######################################################################## export PROG_URL="https://www.nalog.gov.ru" export WH_WINE_USE="wine_x_tkg_10-0_amd64" -export WINEPREFIX="nalog" +export WINEPREFIX="ppdgr2" export PROG_NAME="ППДГР-2" export PROG_ICON="ppdgr" -export BASE_PFX="none" +export BASE_PFX="defpfx_dn48_x86_v01" export WINEARCH="win32" +export INSTALL_DLL="dotnet48 msxml3 msxml4 msxml6 corefonts lucida wsh57 vcrun6 jet40 gdiplus" export WH_WINDOWS_VER="10" var_winedlloverride_update "msxml4=b,wininet=b" -export INSTALL_DLL="corefonts micross tahoma lucida riched20 comctl32 msxml3 msxml4 msxml6 mdac28 wsh57 vcrun6 vb6run jet40 gdiplus vcrun2019 dotnet20sp2 dotnet40 dotnet48" try_get_page "https://www.nalog.gov.ru/rn77/program/5961277/" VER_MSI_SLASH=$(read_page | grep -oP 'href="\K[^"]*.msi[^"]*' | awk -F'/' '{print $(NF-1)}' | head -n 1) diff --git a/testinstall/soun b/testinstall/soun index 8b62629..c8831cf 100644 --- a/testinstall/soun +++ b/testinstall/soun @@ -3,13 +3,14 @@ ######################################################################## export PROG_URL="https://www.nalog.gov.ru" export WH_WINE_USE="wine_x_tkg_10-0_amd64" -export WINEPREFIX="nalog" +export WINEPREFIX="soun" export PROG_NAME="СОУН" export PROG_ICON="soun" -export BASE_PFX="none" +export BASE_PFX="defpfx_x86_v01" export WINEARCH="win32" +export INSTALL_DLL="" export WH_WINDOWS_VER="10" -export INSTALL_DLL="corefonts micross tahoma lucida riched20 comctl32 msxml3 msxml4 msxml6 mdac28 wsh57 vcrun6 vb6run jet40 gdiplus vcrun2019 dotnet20sp2 dotnet40 dotnet48" +export WH_USE_EXTRA_FONTS="1" try_get_page "https://www.nalog.gov.ru/rn77/program/5961268/" VER_MSI_SLASH=$(read_page | grep -oP 'href="\K[^"]*.exe[^"]*' | awk -F'/' '{print $(NF-1)}' | head -n 1) diff --git a/testinstall/tester_n b/testinstall/tester_n index d85cb3b..c574dab 100644 --- a/testinstall/tester_n +++ b/testinstall/tester_n @@ -6,10 +6,10 @@ export WH_WINE_USE="wine_x_tkg_10-0_amd64" export WINEPREFIX="nalog" export PROG_NAME="Тестер" export PROG_ICON="tester" -export BASE_PFX="none" +export BASE_PFX="defpfx_x86_v01" export WINEARCH="win32" +export INSTALL_DLL="msxml3 msxml4 msxml6 corefonts wsh57 vcrun6 jet40 gdiplus" export WH_WINDOWS_VER="10" -export INSTALL_DLL="corefonts micross tahoma lucida riched20 comctl32 msxml3 msxml4 msxml6 mdac28 wsh57 vcrun6 vb6run jet40 gdiplus vcrun2019 dotnet20sp2 dotnet40 dotnet48" try_get_page "https://www.nalog.gov.ru/rn77/program/5961279/" VER_EXE_SLASH=$(read_page | grep -oP 'href="\K[^"]*.exe[^"]*' | awk -F'/' '{print $(NF-1)}' | tail -n 1)