From 7a2fddb5c0b8f29076ed73cb7930b4064c3d0e9b Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Wed, 5 Feb 2025 15:54:38 +0300 Subject: [PATCH] autoinstall: correction of variables --- autoinstall/alta-tamdoc | 10 +++++----- autoinstall/alta-tax | 10 +++++----- autoinstall/alta-zap | 10 +++++----- autoinstall/wed-rp | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/autoinstall/alta-tamdoc b/autoinstall/alta-tamdoc index e739761..e9c1c69 100644 --- a/autoinstall/alta-tamdoc +++ b/autoinstall/alta-tamdoc @@ -1,18 +1,18 @@ #!/usr/bin/env bash # info_ru: Таможенное законодательство ######################################################################## -export PP_WINE_USE="wine_x_tkg_10-0_amd64" +export WH_WINE_USE="wine_x_tkg_10-0_amd64" export WINEPREFIX="alta" export PROG_NAME="Таможенные документы" export PROG_ICON="altatamdoc" export BASE_PFX="alta_pfx_x86_v01" -export PP_WINDOWS_VER="10" +export WH_WINDOWS_VER="10" export WINEARCH="win32" export INSTALL_DLL="corefonts eufonts lucida opensymbol tahoma cjkfonts vb6run mdac28 msxml3 msxml4 msxml6 mfc42 jet40 native_oleaut32" -AUTOINSTALL_EXE="${PP_TMP_DIR}/ordw030225.zip" -AUTOINSTALL_UNPACK="${PP_TMP_DIR}/ordw030225" -AUTOINSTALL_SETUP="${PP_TMP_DIR}/ordw030225/setup.exe" +AUTOINSTALL_EXE="${WH_TMP_DIR}/ordw030225.zip" +AUTOINSTALL_UNPACK="${WH_TMP_DIR}/ordw030225" +AUTOINSTALL_SETUP="${WH_TMP_DIR}/ordw030225/setup.exe" prepair_wine if try_download "https://www2.alta.ru/pub/packets/distr/ordw030225.zip" "${AUTOINSTALL_EXE}" ; then diff --git a/autoinstall/alta-tax b/autoinstall/alta-tax index dbb23eb..c304e8e 100644 --- a/autoinstall/alta-tax +++ b/autoinstall/alta-tax @@ -1,18 +1,18 @@ #!/usr/bin/env bash # info_ru: Расчет контракта ######################################################################## -export PP_WINE_USE="wine_x_tkg_10-0_amd64" +export WH_WINE_USE="wine_x_tkg_10-0_amd64" export WINEPREFIX="alta" export PROG_NAME="Такса" export PROG_ICON="altatax" export BASE_PFX="alta_pfx_x86_v01" -export PP_WINDOWS_VER="10" +export WH_WINDOWS_VER="10" export WINEARCH="win32" export INSTALL_DLL="corefonts eufonts lucida opensymbol tahoma cjkfonts vb6run mdac28 msxml3 msxml4 msxml6 mfc42 jet40 native_oleaut32" -AUTOINSTALL_EXE="${PP_TMP_DIR}/taxwin040225.zip" -AUTOINSTALL_UNPACK="${PP_TMP_DIR}/taxwin040225" -AUTOINSTALL_SETUP="${PP_TMP_DIR}/taxwin040225/setup.exe" +AUTOINSTALL_EXE="${WH_TMP_DIR}/taxwin040225.zip" +AUTOINSTALL_UNPACK="${WH_TMP_DIR}/taxwin040225" +AUTOINSTALL_SETUP="${WH_TMP_DIR}/taxwin040225/setup.exe" prepair_wine if try_download "https://www2.alta.ru/pub/packets/distr/taxwin040225.zip" "${AUTOINSTALL_EXE}" ; then diff --git a/autoinstall/alta-zap b/autoinstall/alta-zap index 61295da..3704e59 100644 --- a/autoinstall/alta-zap +++ b/autoinstall/alta-zap @@ -1,18 +1,18 @@ #!/usr/bin/env bash # info_ru: Автоматизация импорта данных ######################################################################## -export PP_WINE_USE="wine_x_tkg_10-0_amd64" +export WH_WINE_USE="wine_x_tkg_10-0_amd64" export WINEPREFIX="alta" export PROG_NAME="Заполнитель" export PROG_ICON="altazap" export BASE_PFX="alta_pfx_x86_v01" -export PP_WINDOWS_VER="10" +export WH_WINDOWS_VER="10" export WINEARCH="win32" export INSTALL_DLL="corefonts eufonts lucida opensymbol tahoma cjkfonts vb6run mdac28 msxml3 msxml4 msxml6 mfc42 jet40 native_oleaut32" -AUTOINSTALL_EXE="${PP_TMP_DIR}/zapwin040225.zip" -AUTOINSTALL_UNPACK="${PP_TMP_DIR}/zapwin040225" -AUTOINSTALL_SETUP="${PP_TMP_DIR}/zapwin040225/setup.exe" +AUTOINSTALL_EXE="${WH_TMP_DIR}/zapwin040225.zip" +AUTOINSTALL_UNPACK="${WH_TMP_DIR}/zapwin040225" +AUTOINSTALL_SETUP="${WH_TMP_DIR}/zapwin040225/setup.exe" prepair_wine if try_download "https://www1.alta.ru/pub/packets/distr/zapwin040225.zip" "${AUTOINSTALL_EXE}" ; then diff --git a/autoinstall/wed-rp b/autoinstall/wed-rp index e92b965..8d7d174 100644 --- a/autoinstall/wed-rp +++ b/autoinstall/wed-rp @@ -4,18 +4,18 @@ export PROG_NAME="СТМ-Отчет" export PROG_ICON="wedrp" -export PP_WINE_USE="wine_x_tkg_10-0_amd64" +export WH_WINE_USE="wine_x_tkg_10-0_amd64" export WINEPREFIX="wed" export BASE_PFX="wed_pfx_x86_v02" export WINEARCH="win32" -export PP_WINDOWS_VER="7" +export WH_WINDOWS_VER="7" export INSTALL_DLL="vb6run art2k7min mdac27 mdac28 arial jet40 dotnet48 msxml3 msxml6 vcrun2022 wsh57 vcrun6 corefonts ie8" prepair_wine -AUTOINSTALL_EXE="${PP_TMP_DIR}/setup_rp.exe" -AUTOINSTALL_UNPACK="${PP_TMP_DIR}/setup_rp" -AUTOINSTALL_SETUP="${PP_TMP_DIR}/setup_rp/setup.exe" +AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_rp.exe" +AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_rp" +AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_rp/setup.exe" if try_download "https://ftp.ctm.ru/REPORT/SFX/setup_rp.exe" "${AUTOINSTALL_EXE}" ; then 7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"