From 9cc8e8d24913fb4e0ec3337afdcc0c4dd0372971 Mon Sep 17 00:00:00 2001
From: Sergey Palcheh <minergenon@altlinux.org>
Date: Sun, 9 Mar 2025 17:02:03 +0600
Subject: [PATCH 1/3] replacing the declaration 2023 script with
declaration2024
---
autoinstall/declaration2023 | 24 ------------------------
autoinstall/declaration2024 | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 24 deletions(-)
delete mode 100644 autoinstall/declaration2023
create mode 100644 autoinstall/declaration2024
diff --git a/autoinstall/declaration2023 b/autoinstall/declaration2023
deleted file mode 100644
index beec916..0000000
--- a/autoinstall/declaration2023
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-# info_ru: Программа «Декларация 2023» позволяет автоматически формировать налоговые декларации по форме 3-НДФЛ. В процессе заполнения Вами данных программа автоматически проверяет их корректность, что уменьшает вероятность появления ошибки.
-########################################################################
-export WH_AUTOINSTALL="1"
-export AUTOINSTALL_EXE="${WH_TMP_DIR}/InsD2023.msi"
-export WH_WINE_USE="wine_x_tkg_10-0_amd64"
-export WINEPREFIX="declaration2023"
-export PROG_NAME="Декларация 2023"
-# export PROG_VERSION=""
-export PROG_ICON="declarac"
-# export ADD_MIME_TYPE=""
-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"
-
-prepair_wine
-if try_download "https://data.nalog.ru/files/decl2023/1.0.3/InsD2023.msi" "${AUTOINSTALL_EXE}" ; then
- wine_run_install "${AUTOINSTALL_EXE}" "/q"
- try_remove_file "${AUTOINSTALL_EXE}"
-
- WIN_FILE_EXEC="$DRIVE_C/АО ГНИВЦ/Декларация 2023/Decl2023.exe"
- create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
-fi
diff --git a/autoinstall/declaration2024 b/autoinstall/declaration2024
new file mode 100644
index 0000000..0121ea3
--- /dev/null
+++ b/autoinstall/declaration2024
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+# info_ru: Программа «Декларация 2024» позволяет автоматически формировать налоговые декларации по форме 3-НДФЛ. В процессе заполнения Вами данных программа автоматически проверяет их корректность, что уменьшает вероятность появления ошибки.
+########################################################################
+export WH_AUTOINSTALL="1"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export WINEPREFIX="declaration2024"
+export PROG_NAME="Декларация 2024"
+export PROG_ICON="declarac"
+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"
+
+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)
+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)
+
+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"
+ try_remove_file "${AUTOINSTALL_MSI}"
+
+ WIN_FILE_EXEC="$DRIVE_C/АО ГНИВЦ/Декларация 2024/Decl2024.exe"
+ create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+fi
+
From a60a98efce02bcedb7dda1afe77f4826f95317c9 Mon Sep 17 00:00:00 2001
From: Sergey Palcheh <minergenon@altlinux.org>
Date: Sun, 9 Mar 2025 17:03:06 +0600
Subject: [PATCH 2/3] updated definitions of the additional update
---
autoinstall/npul | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/autoinstall/npul b/autoinstall/npul
index 0cf71b3..87f0f2d 100644
--- a/autoinstall/npul
+++ b/autoinstall/npul
@@ -13,7 +13,6 @@ export WINEARCH="win32"
export INSTALL_DLL="msxml3 msxml4 msxml6 corefonts wsh57 vcrun6 jet40 gdiplus"
export WH_WINDOWS_VER="10"
-
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/"
@@ -27,16 +26,14 @@ 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_remove_file "$NPUL_FILE"
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
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"
@@ -46,11 +43,12 @@ if try_download "https://data.nalog.ru/files/nalul/${VER_MSI_SLASH}" "${AUTOINST
#TODO: Сделать запуск процедуры в тихом режиме.
fi
-if try_download "https://data.nalog.ru/files/nalul/${VER_EXE_SLASH}" "${AUTOINSTALL_EXE}" ; then
+if [[ -n "$VER_EXE" ]] && try_download "https://data.nalog.ru/files/nalul/${VER_EXE_SLASH}" "${AUTOINSTALL_EXE}"; then
wine_run_install "${AUTOINSTALL_EXE}" "/SILENT"
try_remove_file "${AUTOINSTALL_EXE}"
+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"
-fi
+ try_remove_file "$NPUL_FILE"
From d83fa933116a8e97c0acf17c6dad4c454f928f11 Mon Sep 17 00:00:00 2001
From: Sergey Palcheh <minergenon@altlinux.org>
Date: Sun, 9 Mar 2025 17:03:51 +0600
Subject: [PATCH 3/3] updated the version to the current one
---
autoinstall/tester_n | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autoinstall/tester_n b/autoinstall/tester_n
index b6f05fa..6ca3040 100644
--- a/autoinstall/tester_n
+++ b/autoinstall/tester_n
@@ -3,7 +3,7 @@
########################################################################
export WH_AUTOINSTALL="1"
export LAUNCH_PARAMETERS="/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-"
-export AUTOINSTALL_EXE="${WH_TMP_DIR}/tester2261.exe"
+export AUTOINSTALL_EXE="${WH_TMP_DIR}/tester2269.exe"
export WH_WINE_USE="wine_x_tkg_10-0_amd64"
export WINEPREFIX="nalog"
export PROG_NAME="Тестер"
@@ -16,7 +16,7 @@ export INSTALL_DLL="msxml3 msxml4 msxml6 corefonts wsh57 vcrun6 jet40 gdiplus"
export WH_WINDOWS_VER="10"
prepair_wine
-if try_download "https://data.nalog.ru/files/tester/2.261/tester2261.exe" "${AUTOINSTALL_EXE}" ; then
+if try_download "https://data.nalog.ru/files/tester/2.269/tester2269.exe" "${AUTOINSTALL_EXE}" ; then
wine_run_install "${AUTOINSTALL_EXE}"
try_remove_file "${AUTOINSTALL_EXE}"