From 201c8185c591e687481c94e392c060ae92e61a76 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Mon, 10 Mar 2025 14:30:22 +0300 Subject: [PATCH] updated npul --- autoinstall/npul | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/autoinstall/npul b/autoinstall/npul index 87f0f2d..72c0820 100644 --- a/autoinstall/npul +++ b/autoinstall/npul @@ -5,9 +5,7 @@ export WH_AUTOINSTALL="1" export WH_WINE_USE="wine_x_tkg_10-0_amd64" export WINEPREFIX="nalog" export PROG_NAME="Налогоплательщик ЮЛ" -# export PROG_VERSION="" export PROG_ICON="npul" -# export ADD_MIME_TYPE="" export BASE_PFX="defpfx_x86_v01" export WINEARCH="win32" export INSTALL_DLL="msxml3 msxml4 msxml6 corefonts wsh57 vcrun6 jet40 gdiplus" @@ -19,7 +17,7 @@ curl -o "$NPUL_FILE" -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" "https: if [[ ! -f "$NPUL_FILE" ]] \ || grep -q "Forbidden" "$NPUL_FILE" then - fatal "The site page is unavailable or the request limit has been exceeded." + fatal "Страница сайта не доступна, или превышено количество запросов к странице." fi VER_MSI=$(grep -oP 'NalogUL\K[0-9.]+(?=\.msi)' "$NPUL_FILE" | tail -n 1) @@ -43,12 +41,16 @@ if try_download "https://data.nalog.ru/files/nalul/${VER_MSI_SLASH}" "${AUTOINST #TODO: Сделать запуск процедуры в тихом режиме. fi -if [[ -n "$VER_EXE" ]] && 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}" +else + print_info "Дополнительных обновлений не требуется." 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" +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"