diff --git a/autoinstall/dialux b/autoinstall/dialux new file mode 100644 index 0000000..42c2b55 --- /dev/null +++ b/autoinstall/dialux @@ -0,0 +1,21 @@ +#!/usr/bin/env bash +# info_ru: Программное обеспечение для 3D-графики, предназначенное для проектирования освещения. (Версия 4.4.0.2) +######################################################################## +export WH_WINE_USE="wine_x_tkg_10-0_i586" +export WINEPREFIX="dialux" +export PROG_NAME="DIALux" +export PROG_ICON="dialux" +export BASE_PFX="none" +export WH_WINDOWS_VER="7" +export WINEARCH="win32" +export INSTALL_DLL="mdac28 jet40 dotnet20sp1 vcrun2010 gdiplus ie8" + +AUTOINSTALL_SETUP="$DRIVE_C/Dialux4_setup/Dialux/DIALux_4402_Admin_Setup.exe" + +prepair_wine + +wine_run_install "${AUTOINSTALL_SETUP}" + +WIN_FILE_EXEC="$DRIVE_C/Program Files/DIALux/DIALux.exe" +create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON" + diff --git a/image/dialux.png b/image/dialux.png new file mode 100644 index 0000000..3cb4b48 Binary files /dev/null and b/image/dialux.png differ diff --git a/testinstall/npul b/testinstall/npul index 163976a..071ddfe 100644 --- a/testinstall/npul +++ b/testinstall/npul @@ -2,19 +2,20 @@ # info_ru: Программа автоматизации процесса подготовки юридическими и физическими лицами документов для представления в налоговые органы в электронной форме и на бумажном носителе. ######################################################################## export PROG_URL="https://www.nalog.gov.ru" -export WH_WINE_USE="wine_x_tkg_10-0_amd64" +export WH_WINE_USE="system" export WINEPREFIX="nalog" export PROG_NAME="Налогоплательщик ЮЛ" export PROG_ICON="npul" -export BASE_PFX="defpfx_x86_v01" -export WINEARCH="win32" -export INSTALL_DLL="msxml3 msxml4 msxml6 corefonts wsh57 vcrun6 jet40 gdiplus" +export BASE_PFX="none" +export WINEARCH="win64" +export INSTALL_DLL="msxml3 msxml4 msxml6 corefonts wsh57 gdiplus" export WH_WINDOWS_VER="10" +export WH_XDG_OPEN="doc" 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=$(read_page | grep -oP 'NalogUL\d+\.msi' | tail -n 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=$(read_page | grep -oP 'NalogUL\d+\.exe' | tail -n 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" @@ -25,7 +26,7 @@ if try_download "https://data.nalog.ru/files/nalul/${VER_MSI_URL}/NalogUL${VER_M wine_run_install "${AUTOINSTALL_MSI}" /quiet INSTALLDIR="c:\npul" try_remove_file "${AUTOINSTALL_MSI}" - PRINT_INSTALLER="$(find "$DRIVE_C/npul/INPUTDOC" -name "*.msi")" + PRINT_INSTALLER="$(find "$DRIVE_C/npul/INPUTDOC" -name "Печать НД с PDF417*.msi")" wine_run_install "${PRINT_INSTALLER}" "/q" # Процедуры конвертации, индексация данных. По завершении процедур программа сама закроется. Признаком успешного завершения будет отсутствие в папке с программой файла setupmarker.ini. Если не принять процедуру, .exe файл обновления не установиться. @@ -38,6 +39,9 @@ if [[ -n "$VER_EXE" ]] \ then wine_run_install "${AUTOINSTALL_EXE}" "/SILENT" try_remove_file "${AUTOINSTALL_EXE}" + + PRINT_INSTALLER="$(find "$DRIVE_C/npul/INPUTDOC" -name "Печать НД с PDF417*.msi" | tail -n 1)" + wine_run_install "${PRINT_INSTALLER}" "/q" else print_info "Дополнительных обновлений не требуется." fi diff --git a/testinstall/ppdgr2 b/testinstall/ppdgr2 index 96ee69b..38a7c7b 100644 --- a/testinstall/ppdgr2 +++ b/testinstall/ppdgr2 @@ -2,16 +2,17 @@ # info_ru: Подготовка документов для государственной регистрации (ППДГР) ######################################################################## export PROG_URL="https://www.nalog.gov.ru" -export WH_WINE_USE="wine_x_tkg_10-0_amd64" +export WH_WINE_USE="system" export WINEPREFIX="ppdgr2" export PROG_NAME="ППДГР-2" export PROG_ICON="ppdgr" -export BASE_PFX="defpfx_dn48_x86_v01" -export WINEARCH="win32" -export INSTALL_DLL="dotnet48 msxml3 msxml4 msxml6 corefonts lucida wsh57 vcrun6 jet40 gdiplus" +export BASE_PFX="none" +export WINEARCH="win64" +export INSTALL_DLL="dotnet48 msxml4 msxml6 corefonts lucida wsh57 vb6run" +# export INSTALL_DLL="dotnet48 msxml3 msxml4 msxml6 corefonts lucida wsh57 vcrun6 jet40 gdiplus vb6run" export WH_WINDOWS_VER="10" export WH_USE_EXTRA_FONTS="1" -var_winedlloverride_update "gdiplus,msxml3,wininet=b;msxml4=n" +# var_winedlloverride_update "gdiplus,msxml3,wininet=b;msxml4=n" 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 c8831cf..f6371b9 100644 --- a/testinstall/soun +++ b/testinstall/soun @@ -2,12 +2,12 @@ # info_ru: Справочник кодов обозначения налоговых органов для целей учета налогоплательщиков ######################################################################## export PROG_URL="https://www.nalog.gov.ru" -export WH_WINE_USE="wine_x_tkg_10-0_amd64" +export WH_WINE_USE="system" export WINEPREFIX="soun" export PROG_NAME="СОУН" export PROG_ICON="soun" -export BASE_PFX="defpfx_x86_v01" -export WINEARCH="win32" +export BASE_PFX="none" +export WINEARCH="win64" export INSTALL_DLL="" export WH_WINDOWS_VER="10" export WH_USE_EXTRA_FONTS="1" diff --git a/testinstall/tester_n b/testinstall/tester_n index c574dab..023a1ec 100644 --- a/testinstall/tester_n +++ b/testinstall/tester_n @@ -2,13 +2,13 @@ # info_ru: Программа проверки файлов на соответствие форматам представления в электронном виде налоговых деклараций, бухгалтерской отчетности. ######################################################################## export PROG_URL="https://www.nalog.gov.ru" -export WH_WINE_USE="wine_x_tkg_10-0_amd64" +export WH_WINE_USE="system" export WINEPREFIX="nalog" export PROG_NAME="Тестер" export PROG_ICON="tester" -export BASE_PFX="defpfx_x86_v01" -export WINEARCH="win32" -export INSTALL_DLL="msxml3 msxml4 msxml6 corefonts wsh57 vcrun6 jet40 gdiplus" +export BASE_PFX="none" +export WINEARCH="win64" +export INSTALL_DLL="msxml3 msxml4 msxml6 corefonts wsh57 gdiplus" export WH_WINDOWS_VER="10" try_get_page "https://www.nalog.gov.ru/rn77/program/5961279/"