From caccc333db07865c01a4dd019f3a9f0dd5ed2813 Mon Sep 17 00:00:00 2001
From: Sergey Palcheh <minergenon@altlinux.org>
Date: Sat, 25 Oct 2025 12:26:42 +0600
Subject: [PATCH] updating tax program scripts

---
 testinstall/declaration | 36 ++++++++++++++++--------------------
 testinstall/npul        | 29 ++++++++++-------------------
 testinstall/ppdgr2      | 16 +++++++++-------
 testinstall/soun        | 15 ++++++++-------
 testinstall/tester_n    | 17 +++++++++--------
 5 files changed, 52 insertions(+), 61 deletions(-)

diff --git a/testinstall/declaration b/testinstall/declaration
index 5f4af17..e40c79e 100644
--- a/testinstall/declaration
+++ b/testinstall/declaration
@@ -3,37 +3,33 @@
 ########################################################################
 export PROG_URL="https://www.nalog.gov.ru"
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
-export WINEPREFIX="declaration"
+export WINEPREFIX="nalog"
 export PROG_NAME="Декларация"
 export PROG_ICON="declarac"
-export BASE_PFX="defpfx_x86_v01"
+export BASE_PFX="none"
 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"
 
-DECL_FILE="${WH_TMP_DIR}/decl.html"
-curl -o "$DECL_FILE" -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" "https://www.nalog.gov.ru/rn77/program/5961249/"
-
-if [[ ! -f "$DECL_FILE" ]] \
-|| grep -q "Forbidden" "$DECL_FILE"
-then
-    fatal "The site page is unavailable or the request limit has been exceeded."
-fi
-
-VER_YEAR=$(grep -oP 'href="\K[^"]*.msi[^"]*' "$DECL_FILE" | awk -F'/' '{print $(NF-2)}' | head -n 1)
+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)
 YEAR="${VER_YEAR//decl/}"
-VER_MSI_SLASH=$(grep -oP 'href="\K[^"]*.msi[^"]*' "$DECL_FILE" | awk -F'/' '{print $(NF-1)}' | head -n 1)
-VER_MSI=$(grep -oP 'href="\K[^"]*.msi[^"]*' "$DECL_FILE" | awk -F'/' '{print $(NF)}' | head -n 1)
-
+VER_MSI_SLASH=$(read_page | grep -oP 'href="\K[^"]*.msi[^"]*' | awk -F'/' '{print $(NF-1)}' | head -n 1)
+VER_MSI=$(read_page | grep -oP 'href="\K[^"]*.msi[^"]*' | awk -F'/' '{print $(NF)}' | head -n 1)
 AUTOINSTALL_MSI="${WH_TMP_DIR}/${VER_MSI}"
 
 prepair_wine
-if try_download "https://data.nalog.ru/files/${VER_YEAR}/${VER_MSI_SLASH}/$VER_MSI" "${AUTOINSTALL_MSI}" ; then
-    wine_run_install "${AUTOINSTALL_MSI}" "/q"
+if try_download "https://data.nalog.ru/files/${VER_YEAR}/${VER_MSI_SLASH}/${VER_MSI}" "${AUTOINSTALL_MSI}" ; then
+    wine_run_install "${AUTOINSTALL_MSI}" /q
     try_remove_file "${AUTOINSTALL_MSI}"
 
     WIN_FILE_EXEC="$DRIVE_C/АО ГНИВЦ/Декларация ${YEAR}/Decl${YEAR}.exe"
     create_desktop "$PROG_NAME $YEAR" "$WIN_FILE_EXEC" "$PROG_ICON"
-    remove_desktop "Декларация $((YEAR - 1))"
-fi
 
+    # Удаляем ярлык предыдущей версии
+    remove_desktop "Декларация $((YEAR - 1))"
+
+    print_info "Программа Декларация $YEAR успешно установлена"
+else
+    fatal "Не удалось скачать установочный файл"
+fi
diff --git a/testinstall/npul b/testinstall/npul
index 898677f..c36c1ba 100644
--- a/testinstall/npul
+++ b/testinstall/npul
@@ -6,32 +6,24 @@ export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="nalog"
 export PROG_NAME="Налогоплательщик ЮЛ"
 export PROG_ICON="npul"
-export BASE_PFX="defpfx_x86_v01"
+export BASE_PFX="none"
 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"
 
-NPUL_FILE="${WH_TMP_DIR}/npul.html"
-curl -o "$NPUL_FILE" -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" "https://www.nalog.gov.ru/rn77/program/5961229/"
-
-if [[ ! -f "$NPUL_FILE" ]] \
-|| grep -q "Forbidden" "$NPUL_FILE"
-then
-    fatal "Страница сайта не доступна, или превышено количество запросов к странице."
-fi
-
-VER_MSI=$(grep -oP 'NalogUL\K[0-9.]+(?=\.msi)' "$NPUL_FILE" | tail -n 1)
-VER_MSI_SLASH=$(grep -oP '[0-9]+\.[0-9]+/NalogUL[0-9]+\.msi' "$NPUL_FILE" | tail -n 1)
-VER_EXE=$(grep -oP 'NalogUL\K[0-9.]+(?=\.exe)' "$NPUL_FILE" | tail -n 1)
-VER_EXE_SLASH=$(grep -oP '[0-9]+\.[0-9]+\.[0-9]+/NalogUL[0-9]+\.exe' "$NPUL_FILE" | tail -n 1)
+try_get_page "https://data.nalog.ru/rn77/program/5961229/"
+VER_MSI=$(read_page | grep -oP 'NalogUL\d+\.msi' | tail -1 | grep -oP '\d+')
+VER_MSI_URL="${VER_MSI:0:1}.${VER_MSI:1}"  # 492 → 4.92
+VER_EXE=$(read_page | grep -oP 'NalogUL\d+\.exe' | tail -1 | grep -oP '\d+')
+VER_EXE_URL="${VER_EXE:0:1}.${VER_EXE:1:2}.${VER_EXE:3}"  # 4924 → 4.92.4
 
 AUTOINSTALL_MSI="${WH_TMP_DIR}/NalogUL${VER_MSI}.msi"
 AUTOINSTALL_EXE="${WH_TMP_DIR}/NalogUL${VER_EXE}.exe"
 
 prepair_wine
-if try_download "https://data.nalog.ru/files/nalul/${VER_MSI_SLASH}" "${AUTOINSTALL_MSI}" ; then
+if try_download "https://data.nalog.ru/files/nalul/${VER_MSI_URL}/NalogUL${VER_MSI}.msi" "${AUTOINSTALL_MSI}" ; then
     wine_run_install "${AUTOINSTALL_MSI}" /quiet INSTALLDIR="c:\npul"
-   try_remove_file "${AUTOINSTALL_MSI}"
+    try_remove_file "${AUTOINSTALL_MSI}"
 
     PRINT_INSTALLER="$(find "$DRIVE_C/npul/INPUTDOC" -name "*.msi")"
     wine_run_install "${PRINT_INSTALLER}" "/q"
@@ -42,7 +34,7 @@ if try_download "https://data.nalog.ru/files/nalul/${VER_MSI_SLASH}" "${AUTOINST
 fi
 
 if [[ -n "$VER_EXE" ]] \
-&& try_download "https://data.nalog.ru/files/nalul/${VER_EXE_SLASH}" "${AUTOINSTALL_EXE}"
+&& try_download "https://data.nalog.ru/files/nalul/${VER_EXE_URL}/NalogUL${VER_EXE}.exe" "${AUTOINSTALL_EXE}"
 then
     wine_run_install "${AUTOINSTALL_EXE}" "/SILENT"
     try_remove_file "${AUTOINSTALL_EXE}"
@@ -53,4 +45,3 @@ fi
 touch "$DRIVE_C/npul/INPUTDOC/linux.txt"
 WIN_FILE_EXEC="$DRIVE_C/npul/INPUTDOC/inputdoc.exe"
 create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
-try_remove_file "$NPUL_FILE"
diff --git a/testinstall/ppdgr2 b/testinstall/ppdgr2
index 3bf87eb..dd6b5ce 100644
--- a/testinstall/ppdgr2
+++ b/testinstall/ppdgr2
@@ -2,24 +2,26 @@
 # info_ru: Подготовка документов для государственной регистрации (ППДГР)
 ########################################################################
 export PROG_URL="https://www.nalog.gov.ru"
-export AUTOINSTALL_EXE="${WH_TMP_DIR}/SetupPPDGR2.msi"
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
-export WINEPREFIX="ppdgr2"
+export WINEPREFIX="nalog"
 export PROG_NAME="ППДГР-2"
-# export PROG_VERSION=""
 export PROG_ICON="ppdgr"
-# export ADD_MIME_TYPE=""
-export BASE_PFX="defpfx_dn48_x86_v01"
+export BASE_PFX="none"
 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)
+AUTOINSTALL_EXE="${WH_TMP_DIR}/SetupPPDGR2.msi"
 
 prepair_wine
-if try_download "https://data.nalog.ru/files/ppdgr/2.7.0/SetupPPDGR2.msi" "${AUTOINSTALL_EXE}" ; then
+if try_download "https://data.nalog.ru/files/ppdgr/${VER_MSI_SLASH}/SetupPPDGR2.msi" "${AUTOINSTALL_EXE}" ; then
     wine_run_install "${AUTOINSTALL_EXE}" /q
     try_remove_file "${AUTOINSTALL_EXE}"
 
     WIN_FILE_EXEC="$DRIVE_C/АО ГНИВЦ/ППДГР-2/PPDGR2.exe"
     create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
 fi
+https://data.nalog.ru/files/ppdgr/2.7.3/SetupPPDGR2.msi
diff --git a/testinstall/soun b/testinstall/soun
index 8f9e182..8b62629 100644
--- a/testinstall/soun
+++ b/testinstall/soun
@@ -2,20 +2,21 @@
 # info_ru: Справочник кодов обозначения налоговых органов для целей учета налогоплательщиков
 ########################################################################
 export PROG_URL="https://www.nalog.gov.ru"
-export AUTOINSTALL_EXE="${WH_TMP_DIR}/soun_ins.exe"
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
-export WINEPREFIX="soun"
+export WINEPREFIX="nalog"
 export PROG_NAME="СОУН"
-# export PROG_VERSION=""
 export PROG_ICON="soun"
-# export ADD_MIME_TYPE=""
-export BASE_PFX="defpfx_x86_v01"
+export BASE_PFX="none"
 export WINEARCH="win32"
-export INSTALL_DLL="corefonts"
 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/5961268/"
+VER_MSI_SLASH=$(read_page | grep -oP 'href="\K[^"]*.exe[^"]*' | awk -F'/' '{print $(NF-1)}' | head -n 1)
+AUTOINSTALL_EXE="${WH_TMP_DIR}/soun_ins.exe"
 
 prepair_wine
-if try_download "https://data.nalog.ru/files/Soun/2.6.2/soun_ins.exe" "${AUTOINSTALL_EXE}" ; then
+if try_download "https://data.nalog.ru/files/Soun/${VER_MSI_SLASH}/soun_ins.exe" "${AUTOINSTALL_EXE}" ; then
     # TODO: Тихий режим или предупреждение
     wine_run_install "${AUTOINSTALL_EXE}"
     try_remove_file "${AUTOINSTALL_EXE}"
diff --git a/testinstall/tester_n b/testinstall/tester_n
index d64145e..d85cb3b 100644
--- a/testinstall/tester_n
+++ b/testinstall/tester_n
@@ -2,22 +2,23 @@
 # info_ru: Программа проверки файлов на соответствие форматам представления в электронном виде налоговых деклараций, бухгалтерской отчетности.
 ########################################################################
 export PROG_URL="https://www.nalog.gov.ru"
-export LAUNCH_PARAMETERS="/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-"
-export AUTOINSTALL_EXE="${WH_TMP_DIR}/tester2269.exe"
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="nalog"
 export PROG_NAME="Тестер"
-# export PROG_VERSION=""
 export PROG_ICON="tester"
-# export ADD_MIME_TYPE=""
-export BASE_PFX="defpfx_x86_v01"
+export BASE_PFX="none"
 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)
+VER_EXE=$(read_page | grep -oP 'href="\K[^"]*.exe[^"]*' | awk -F'/' '{print $(NF)}' | tail -n 1)
+AUTOINSTALL_EXE="${WH_TMP_DIR}/${VER_EXE}"
 
 prepair_wine
-if try_download "https://data.nalog.ru/files/tester/2.269/tester2269.exe" "${AUTOINSTALL_EXE}" ; then
-    wine_run_install "${AUTOINSTALL_EXE}"
+if try_download "https://data.nalog.ru/files/tester/${VER_EXE_SLASH}/${VER_EXE}" "${AUTOINSTALL_EXE}" ; then
+    wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
     try_remove_file "${AUTOINSTALL_EXE}"
 
     WIN_FILE_EXEC="$DRIVE_C/Tester/tester.exe"