forked from CastroFidel/winehelper
updated definitions of the additional update
This commit is contained in:
parent
9cc8e8d249
commit
a60a98efce
@ -13,7 +13,6 @@ export WINEARCH="win32"
|
|||||||
export INSTALL_DLL="msxml3 msxml4 msxml6 corefonts wsh57 vcrun6 jet40 gdiplus"
|
export INSTALL_DLL="msxml3 msxml4 msxml6 corefonts wsh57 vcrun6 jet40 gdiplus"
|
||||||
export WH_WINDOWS_VER="10"
|
export WH_WINDOWS_VER="10"
|
||||||
|
|
||||||
|
|
||||||
NPUL_FILE="${WH_TMP_DIR}/npul.html"
|
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/"
|
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_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=$(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)
|
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_MSI="${WH_TMP_DIR}/NalogUL${VER_MSI}.msi"
|
||||||
AUTOINSTALL_EXE="${WH_TMP_DIR}/NalogUL${VER_EXE}.exe"
|
AUTOINSTALL_EXE="${WH_TMP_DIR}/NalogUL${VER_EXE}.exe"
|
||||||
|
|
||||||
|
|
||||||
prepair_wine
|
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_SLASH}" "${AUTOINSTALL_MSI}" ; then
|
||||||
wine_run_install "${AUTOINSTALL_MSI}" /quiet INSTALLDIR="c:\npul"
|
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")"
|
PRINT_INSTALLER="$(find "$DRIVE_C/npul/INPUTDOC" -name "*.msi")"
|
||||||
wine_run_install "${PRINT_INSTALLER}" "/q"
|
wine_run_install "${PRINT_INSTALLER}" "/q"
|
||||||
@ -46,11 +43,12 @@ if try_download "https://data.nalog.ru/files/nalul/${VER_MSI_SLASH}" "${AUTOINST
|
|||||||
#TODO: Сделать запуск процедуры в тихом режиме.
|
#TODO: Сделать запуск процедуры в тихом режиме.
|
||||||
fi
|
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"
|
wine_run_install "${AUTOINSTALL_EXE}" "/SILENT"
|
||||||
try_remove_file "${AUTOINSTALL_EXE}"
|
try_remove_file "${AUTOINSTALL_EXE}"
|
||||||
|
fi
|
||||||
|
|
||||||
touch "$DRIVE_C/npul/INPUTDOC/linux.txt"
|
touch "$DRIVE_C/npul/INPUTDOC/linux.txt"
|
||||||
WIN_FILE_EXEC="$DRIVE_C/npul/INPUTDOC/inputdoc.exe"
|
WIN_FILE_EXEC="$DRIVE_C/npul/INPUTDOC/inputdoc.exe"
|
||||||
create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
|
create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
|
||||||
fi
|
try_remove_file "$NPUL_FILE"
|
||||||
|
Loading…
Reference in New Issue
Block a user