updated changelog to 0.4.5

self_check_script: /usr/bin/bash to /usr/bin/env bash
updated changelog to 0.4.4
2025-06-19 16:55:44 +03:00 · 2025-06-19 16:53:30 +03:00 · 2025-06-19 16:33:38 +03:00 · 2025-06-19 16:22:06 +03:00 · 2025-06-19 16:05:39 +03:00 · 2025-06-19 15:20:55 +03:00
35 changed files with 345 additions and 391 deletions
--- a/23
+++ b/23
@@ -1,5 +1,28 @@
 История изменений:

+0.4.5:
+* скорректирована проверка синтаксиса скриптов
+
+0.4.4:
+* добавлены/обновлены скрипты установки:
+    winehelper install t-flex-cad17 - "T-FLEX CAD 17"
+    winehelper install t-flex-doc17 - "T-FLEX DOCs 17"
+    winehelper install t-flex-cad2d+17 - "T-FLEX CAD 2D+ 17"
+    winehelper install t-flex-cad-edu17 - "T-FLEX CAD Учебная Версия 17"
+    winehelper install t-flex-viewer17 - "T-FLEX Viewer 17"
+
+    winehelper install t-flex-cad17-applications
+    Приложения для T-FLEX CAD 17 (T-FLEX Анализ 17, T-FLEX Динамика 17, T-FLEX Зубчатые передачи 17, T-FLEX ЧПУ 17, T-FLEX Раскрой 17, T-FLEX Электротехника 17, T-FLEX VR 17, T-FLEX Печатные платы 17)
+
+    winehelper install t-flex-cad17-resources
+    Обучающие материалы, примеры, бесплатные библиотеки для T-FLEX CAD 17 (Учебное пособие 17, Стандартные элементы 17, Элементы уплотнительной техники 17, Станочные приспособления 17, Детали штампов листовой штамповки 17, Детали пресс-форм 17, Примеры 17)
+
+* добавлена ручная установка дополнений для T-FLEX CAD 17:
+    winehelper install t-flex-cad17-manual "/путь/до/файла"
+
+0.4.3:
+* исправлено обновление префикса при первом запуске
+
 0.4.2:
 * исправлено создание и восстановление резервных копий с разными именами пользователей

--- a/autoinstall/alta-expert
+++ b/autoinstall/alta-expert
@@ -16,7 +16,7 @@ AUTOINSTALL_SETUP="${WH_TMP_DIR}/expert${ALTA_VERSION}/setup.exe"

 prepair_wine
 if try_download "https://www1.alta.ru/pub/packets/distr/expert${ALTA_VERSION}.zip" "${AUTOINSTALL_EXE}" ; then
-    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
    try_remove_file "$AUTOINSTALL_EXE"

    wine_run_install "${AUTOINSTALL_SETUP}" /S /OVERWRITE
--- a/autoinstall/alta-gtd
+++ b/autoinstall/alta-gtd
@@ -16,7 +16,7 @@ AUTOINSTALL_SETUP="${WH_TMP_DIR}/gtdw280125/setup.exe"

 prepair_wine
 if try_download "https://www2.alta.ru/pub/packets/distr/gtdw280125.zip" "${AUTOINSTALL_EXE}" ; then
-    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
    try_remove_file "$AUTOINSTALL_EXE"

    wine_run_install "${AUTOINSTALL_SETUP}" /S /OVERWRITE
--- a/autoinstall/alta-maximum
+++ b/autoinstall/alta-maximum
@@ -16,7 +16,7 @@ AUTOINSTALL_SETUP="${WH_TMP_DIR}/maximum${ALTA_VERSION}/setup.exe"

 prepair_wine
 if try_download "https://www2.alta.ru/pub/packets/distr/maximum${ALTA_VERSION}.zip" "${AUTOINSTALL_EXE}" ; then
-    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
    try_remove_file "$AUTOINSTALL_EXE"

    wine_run_install "${AUTOINSTALL_SETUP}" /S /OVERWRITE
--- a/autoinstall/alta-tamdoc
+++ b/autoinstall/alta-tamdoc
@@ -16,7 +16,7 @@ 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
-    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
    try_remove_file "$AUTOINSTALL_EXE"

    wine_run_install "${AUTOINSTALL_SETUP}" /S /OVERWRITE
--- a/autoinstall/alta-tax
+++ b/autoinstall/alta-tax
@@ -16,7 +16,7 @@ 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
-    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
    try_remove_file "$AUTOINSTALL_EXE"

    wine_run_install "${AUTOINSTALL_SETUP}" /S /OVERWRITE
--- a/autoinstall/alta-zap
+++ b/autoinstall/alta-zap
@@ -16,7 +16,7 @@ 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
-    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
    try_remove_file "$AUTOINSTALL_EXE"

    wine_run_install "${AUTOINSTALL_SETUP}" /S /OVERWRITE
--- a/autoinstall/ctm-finance
+++ b/autoinstall/ctm-finance
@@ -18,7 +18,7 @@ AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_fn"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_fn/setup.exe"

 if try_download "https://files.ctm.ru/FINANCE/SFX/setup_fn.exe" "${AUTOINSTALL_EXE}" ; then
-    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
    try_remove_file "$AUTOINSTALL_EXE"

    wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\FINANCE" /auto /hide
--- a/autoinstall/ctm-journals
+++ b/autoinstall/ctm-journals
@@ -18,7 +18,7 @@ AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_jr"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_jr/setup.exe"

 if try_download "https://files.ctm.ru/JOURNALS/SFX/setup_jr.exe" "${AUTOINSTALL_EXE}" ; then
-    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
    try_remove_file "$AUTOINSTALL_EXE"

    wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\JOURNALS" /auto /hide
--- a/autoinstall/ctm-monitor
+++ b/autoinstall/ctm-monitor
@@ -18,7 +18,7 @@ AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_me"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_me/setup.exe"

 if try_download "https://files.ctm.ru/MONITOR_ED/SFX/setup_me.exe" "${AUTOINSTALL_EXE}" ; then
-    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
    try_remove_file "$AUTOINSTALL_EXE"

    wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\MONITOR_ED" /auto /hide
--- a/autoinstall/ctm-report
+++ b/autoinstall/ctm-report
@@ -18,7 +18,7 @@ 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}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
    try_remove_file "$AUTOINSTALL_EXE"

    wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\REPORT" /auto /hide
--- a/autoinstall/ctm-service
+++ b/autoinstall/ctm-service
@@ -18,7 +18,7 @@ AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_cs"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_cs/setup.exe"

 if try_download "https://files.ctm.ru/CSERVICE/SFX/setup_cs.exe" "${AUTOINSTALL_EXE}" ; then
-    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
    try_remove_file "$AUTOINSTALL_EXE"

    wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\CSERVICE" /auto /hide
--- a/autoinstall/easymnemo
+++ b/autoinstall/easymnemo
@@ -16,7 +16,7 @@ AUTOINSTALL_SETUP="${WH_TMP_DIR}/Easymnemo/EasyMnemo.msi"

 prepair_wine
 if try_download "https://s.siteapi.org/c6e311629e736a8.ru/docs/j3pdl4vxv5wkg0sg0ksks40k8ss0sc" "${AUTOINSTALL_EXE}" ; then
-    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
    try_remove_file "$AUTOINSTALL_EXE"

    wine_run_install "${AUTOINSTALL_SETUP}" /q
--- a/autoinstall/spravki-bk
+++ b/autoinstall/spravki-bk
@@ -16,7 +16,7 @@ AUTOINSTALL_SETUP="${WH_TMP_DIR}/SpravkiBk/SpravkiBk-2-5-5-2275-Internet.msi"

 prepair_wine
 if try_download "https://spravki-bk.ru/wp-content/uploads/СПО-Справки-БК-(версия-2.5.5)-от-31.01.2024.zip" "${AUTOINSTALL_EXE}" ; then
-    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
    try_remove_file "$AUTOINSTALL_EXE"

    wine_run_install "${AUTOINSTALL_SETUP}" /q
--- a/autoinstall/t-flex-cad-edu17
+++ b/autoinstall/t-flex-cad-edu17
@@ -2,75 +2,16 @@
 # info_ru: Учебная версия. САПР, объединяющая в себе мощные параметрические возможности 2D и 3D-моделирования со средствами создания и оформления чертежей и конструкторской документации по ЕСКД.
 ########################################################################
 export PROG_NAME="T-FLEX CAD Учебная Версия 17"
-export WH_WINDOWS_VER="10"
-export WH_WINE_USE="wine_x_tkg_10-0_amd64"
-export BASE_PFX="tflex17_pfx_x64_v01"
-export WINEARCH="win64"
-export WINEPREFIX="tflex17"
-export PROG_VERSION=""
 export PROG_ICON="tflexcad"
-export INSTALL_DLL="corefonts d3dcompiler_47 dotnet48 vcrun2019 ucrtbase2019 msxml6 fontsmooth=rgb baekmuk droid eufonts ipamona liberation lucida opensymbol sourcehansans tahoma takao uff unifont vlgothic wenquanyi wenquanyizenhei"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export WINEARCH="win64"
+export WH_WINDOWS_VER="10"
+export WINEPREFIX="tflex17"
+export WH_XDG_OPEN="log"

-prepair_wine
-if [[ "$BASE_PFX" == "none" ]] \
-|| ! systemctl list-units --type service --state running | grep aksusbd \
-|| ! systemctl list-units --type service --state running | grep hasplmd
-then
-    # Компоненты поддержки T-FLEX PLM 17 (Linux)
-    AUTOINSTALL_ZIP_LIN="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux.zip"
-    AUTOINSTALL_DIR_LIN="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux"
-    AUTOINSTALL_EXE_LIN1="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/fake_hasp.reg"
-    if try_download "https://www.tflex.ru/downloads/Prerequisites_T-FLEX_17_Linux.zip" "${AUTOINSTALL_ZIP_LIN}" ; then
-        7z x -y "${AUTOINSTALL_ZIP_LIN}" -o"${AUTOINSTALL_DIR_LIN}"
-        try_remove_file "$AUTOINSTALL_ZIP_LIN"
-        "$WINELOADER" regedit "${AUTOINSTALL_EXE_LIN1}"
-    fi
-
-    if [[ "$BASE_PFX" == "none" ]] ; then
-        # Компоненты поддержки T-FLEX PLM 17 (Windows)
-        AUTOINSTALL_ZIP_WIN="${WH_TMP_DIR}/T-FLEX 17 Prerequisites.zip"
-        AUTOINSTALL_DIRWIN="${WH_TMP_DIR}"
-        AUTOINSTALL_EXE_WIN1="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/Access Database Engine 2007/AccessDatabaseEngine.exe"
-        AUTOINSTALL_EXE_WIN_MSY="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/Access Database Engine 2007"
-        AUTOINSTALL_EXE_WIN2="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/TSC2/Setup_TSC2.msi"
-        if try_download "https://www.tflex.ru/downloads/T-FLEX%2017%20Prerequisites.zip" "${AUTOINSTALL_ZIP_WIN}" ; then
-            7z x -y "${AUTOINSTALL_ZIP_WIN}" -o"${AUTOINSTALL_DIRWIN}"
-            try_remove_file "$AUTOINSTALL_ZIP_WIN"
-
-            7z x -y "${AUTOINSTALL_EXE_WIN1}" -o"${AUTOINSTALL_EXE_WIN_MSY}"
-            try_remove_file "$AUTOINSTALL_EXE_WIN1"
-
-            wine_run_install "${AUTOINSTALL_EXE_WIN_MSY}/AceRedist.msi" /q
-            wine_run_install "${AUTOINSTALL_EXE_WIN2}" /q
-        fi
-        rm -fR "$DRIVE_C/Program Files/Common Files/System"
-        rm -fR "$DRIVE_C/Program Files (x86)/Common Files/System"
-        cp -r "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Program Files/Common Files/System" "$DRIVE_C/Program Files/Common Files"
-        cp -r "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Program Files (x86)/Common Files/System" "$DRIVE_C/Program Files (x86)/Common Files"
-        mv -f "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Windows/System32/"*.dll "$DRIVE_C/windows/system32"
-
-        "$WINELOADER" regedit "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/ado-32.reg"
-        "$WINELOADER"64 regedit "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/ado-64.reg"
-        "$WINELOADER" regedit "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/tflex.reg"
-    fi
-
-    if systemctl list-units --type service --state running | grep aksusbd \
-    && systemctl list-units --type service --state running | grep hasplmd
-    then
-        print_info "Службы aksusbd и hasplmd уже запущены. Пропускаем..."
-    else
-        echo "#!/usr/bin/env bash
-        cd \"${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/HASP_Linux/aksusbd/\"
-        bash ./dinst
-        mv -f \"${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/HASP_Linux/\"*.so /var/hasplm/
-        systemctl restart hasplmd.service" > "${WH_TMP_DIR}/tflex17_aksusbd.sh"
-        chmod +x ${WH_TMP_DIR}/tflex17_aksusbd.sh
-        su_run "${WH_TMP_DIR}/tflex17_aksusbd.sh"
-        try_remove_file "${WH_TMP_DIR}/tflex17_aksusbd.sh"
-    fi
-    try_remove_dir "$AUTOINSTALL_DIR_LIN"
-    try_remove_dir "${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/"
-fi
+# используем общий whdb файл для подготовки префикса и сервисов
+# prepair_wine используется из файла настроек
+source "$WH_DB_DIR/t-flex-cad17.whdb"

 # Программа T-FLEX CAD Учебная Версия
 export AUTOINSTALL_ZIP="${WH_TMP_DIR}/TFCAD_ST_17x64_PACK.zip"
@@ -80,7 +21,7 @@ export AUTOINSTALL_COMPONENTS="${WH_TMP_DIR}/Компоненты поддерж
 export AUTOINSTALL_ELEMENTS="${WH_TMP_DIR}/Стандартные элементы 17/Стандартные элементы 17.msi"

 if try_download "https://www.tflexcad.ru/download/t-flex-cad-free/files/TFCAD_ST_17x64_PACK.zip" "${AUTOINSTALL_ZIP}" ; then
-    7z x -y "${AUTOINSTALL_ZIP}" -o"${AUTOINSTALL_DIR}"
+    unpack "${AUTOINSTALL_ZIP}" "${AUTOINSTALL_DIR}"
    try_remove_file "${AUTOINSTALL_ZIP}"

    wine_run_install "${AUTOINSTALL_EDUCATION}" /q
--- a/autoinstall/t-flex-cad17
+++ b/autoinstall/t-flex-cad17
@@ -2,75 +2,16 @@
 # info_ru: Профессиональная САПР, объединяющая в себе мощные параметрические возможности 2D и 3D-моделирования со средствами создания и оформления чертежей и конструкторской документации по ЕСКД.
 ########################################################################
 export PROG_NAME="T-FLEX CAD 17"
-export WH_WINDOWS_VER="10"
-export WH_WINE_USE="wine_x_tkg_10-0_amd64"
-export BASE_PFX="tflex17_pfx_x64_v01"
-export WINEARCH="win64"
-export WINEPREFIX="tflex17"
-export PROG_VERSION=""
 export PROG_ICON="tflexcad"
-export INSTALL_DLL="corefonts d3dcompiler_47 dotnet48 vcrun2019 ucrtbase2019 msxml6 fontsmooth=rgb baekmuk droid eufonts ipamona liberation lucida opensymbol sourcehansans tahoma takao uff unifont vlgothic wenquanyi wenquanyizenhei"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export WINEARCH="win64"
+export WH_WINDOWS_VER="10"
+export WINEPREFIX="tflex17"
+export WH_XDG_OPEN="log"

-prepair_wine
-if [[ "$BASE_PFX" == "none" ]] \
-|| ! systemctl list-units --type service --state running | grep aksusbd \
-|| ! systemctl list-units --type service --state running | grep hasplmd
-then
-    # Компоненты поддержки T-FLEX PLM 17 (Linux)
-    AUTOINSTALL_ZIP_LIN="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux.zip"
-    AUTOINSTALL_DIR_LIN="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux"
-    AUTOINSTALL_EXE_LIN1="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/fake_hasp.reg"
-    if try_download "https://www.tflex.ru/downloads/Prerequisites_T-FLEX_17_Linux.zip" "${AUTOINSTALL_ZIP_LIN}" ; then
-        7z x -y "${AUTOINSTALL_ZIP_LIN}" -o"${AUTOINSTALL_DIR_LIN}"
-        try_remove_file "$AUTOINSTALL_ZIP_LIN"
-        "$WINELOADER" regedit "${AUTOINSTALL_EXE_LIN1}"
-    fi
-
-    if [[ "$BASE_PFX" == "none" ]] ; then
-        # Компоненты поддержки T-FLEX PLM 17 (Windows)
-        AUTOINSTALL_ZIP_WIN="${WH_TMP_DIR}/T-FLEX 17 Prerequisites.zip"
-        AUTOINSTALL_DIRWIN="${WH_TMP_DIR}"
-        AUTOINSTALL_EXE_WIN1="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/Access Database Engine 2007/AccessDatabaseEngine.exe"
-        AUTOINSTALL_EXE_WIN_MSY="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/Access Database Engine 2007"
-        AUTOINSTALL_EXE_WIN2="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/TSC2/Setup_TSC2.msi"
-        if try_download "https://www.tflex.ru/downloads/T-FLEX%2017%20Prerequisites.zip" "${AUTOINSTALL_ZIP_WIN}" ; then
-            7z x -y "${AUTOINSTALL_ZIP_WIN}" -o"${AUTOINSTALL_DIRWIN}"
-            try_remove_file "$AUTOINSTALL_ZIP_WIN"
-
-            7z x -y "${AUTOINSTALL_EXE_WIN1}" -o"${AUTOINSTALL_EXE_WIN_MSY}"
-            try_remove_file "$AUTOINSTALL_EXE_WIN1"
-
-            wine_run_install "${AUTOINSTALL_EXE_WIN_MSY}/AceRedist.msi" /q
-            wine_run_install "${AUTOINSTALL_EXE_WIN2}" /q
-        fi
-        rm -fR "$DRIVE_C/Program Files/Common Files/System"
-        rm -fR "$DRIVE_C/Program Files (x86)/Common Files/System"
-        cp -r "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Program Files/Common Files/System" "$DRIVE_C/Program Files/Common Files"
-        cp -r "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Program Files (x86)/Common Files/System" "$DRIVE_C/Program Files (x86)/Common Files"
-        mv -f "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Windows/System32/"*.dll "$DRIVE_C/windows/system32"
-
-        "$WINELOADER" regedit "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/ado-32.reg"
-        "$WINELOADER"64 regedit "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/ado-64.reg"
-        "$WINELOADER" regedit "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/tflex.reg"
-    fi
-
-    if systemctl list-units --type service --state running | grep aksusbd \
-    && systemctl list-units --type service --state running | grep hasplmd
-    then
-        print_info "Службы aksusbd и hasplmd уже запущены. Пропускаем..."
-    else
-        echo "#!/usr/bin/env bash
-        cd \"${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/HASP_Linux/aksusbd/\"
-        bash ./dinst
-        mv -f \"${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/HASP_Linux/\"*.so /var/hasplm/
-        systemctl restart hasplmd.service" > "${WH_TMP_DIR}/tflex17_aksusbd.sh"
-        chmod +x ${WH_TMP_DIR}/tflex17_aksusbd.sh
-        su_run "${WH_TMP_DIR}/tflex17_aksusbd.sh"
-        try_remove_file "${WH_TMP_DIR}/tflex17_aksusbd.sh"
-    fi
-    try_remove_dir "$AUTOINSTALL_DIR_LIN"
-    try_remove_dir "${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/"
-fi
+# используем общий whdb файл для подготовки префикса и сервисов
+# prepair_wine используется из файла настроек
+source "$WH_DB_DIR/t-flex-cad17.whdb"

 # Программа T-FLEX CAD
 export AUTOINSTALL_ZIP="${WH_TMP_DIR}/T-FLEX CAD 17.zip"
@@ -78,7 +19,7 @@ export AUTOINSTALL_DIR="${WH_TMP_DIR}"
 export AUTOINSTALL_EXE="${WH_TMP_DIR}/T-FLEX CAD 17/T-FLEX CAD 17.msi"

 if try_download "https://www.tflex.ru/downloads/T-FLEX%20CAD%2017.zip" "${AUTOINSTALL_ZIP}" ; then
-    7z x -y "${AUTOINSTALL_ZIP}" -o"${AUTOINSTALL_DIR}"
+    unpack "${AUTOINSTALL_ZIP}" "${AUTOINSTALL_DIR}"
    try_remove_file "${AUTOINSTALL_ZIP}"

    wine_run_install "${AUTOINSTALL_EXE}" /q
--- a/autoinstall/t-flex-cad17-applications
+++ b/autoinstall/t-flex-cad17-applications
@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+# info_ru: Приложения для T-FLEX CAD 17 (T-FLEX Анализ 17, T-FLEX Динамика 17, T-FLEX Зубчатые передачи 17, T-FLEX ЧПУ 17, T-FLEX Раскрой 17, T-FLEX Электротехника 17, T-FLEX VR 17, T-FLEX Печатные платы 17)
+########################################################################
+export WH_WINDOWS_VER="10"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export BASE_PFX="tflex17_pfx_x64_v01"
+export WINEARCH="win64"
+export WINEPREFIX="tflex17"
+export WH_XDG_OPEN="log"
+
+check_prefix_var
+if [[ ! -f "$WINEPREFIX/drive_c/Program Files/T-FLEX CAD 17/Program/TFlexCad.exe" ]]
+then fatal "Изначально установите T-FLEX CAD 17."
+fi
+
+BASE_URL="https://www.tflex.ru/downloads"
+FILES=(
+    "T-FLEX Analysis 17.zip"
+    "T-FLEX Dynamics 17.zip"
+    "T-FLEX Gears 17.zip"
+    "T-FLEX CAM 17.zip"
+    "T-FLEX Nesting 17.zip"
+    "T-FLEX Electrical 17.zip"
+    "T-FLEX VR 17.zip"
+    "T-FLEX Circuits 17.zip"
+)
+UNPACK_APP="${WH_TMP_DIR}/unpack_applications"
+
+prepair_wine
+
+# Скачивание всех файлов
+for file_name in "${FILES[@]}" ; do
+    local output="${WH_TMP_DIR}/${file_name// /_}"
+
+    if try_download "$BASE_URL/$file_name" "$output" ; then
+        unpack "$output" "${UNPACK_APP}"
+    fi
+    try_remove_file "$output"
+done
+
+# Установка .msi файлов
+for msi_file in "${UNPACK_APP}"/*/*.msi ; do
+    if [[ -f "$msi_file" ]] ; then
+        wine_run_install "$msi_file" /q
+    else
+        fatal "Нет .msi файлов для установки в ${UNPACK_APP}/*."
+    fi
+done
+
+try_remove_dir "${UNPACK_APP}"
--- a/autoinstall/t-flex-cad17-resources
+++ b/autoinstall/t-flex-cad17-resources
@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+# info_ru: Обучающие материалы, примеры, бесплатные библиотеки для T-FLEX CAD 17 (Учебное пособие 17, Стандартные элементы 17, Элементы уплотнительной техники 17, Станочные приспособления 17, Детали штампов листовой штамповки 17, Детали пресс-форм 17, Примеры 17)
+########################################################################
+export WH_WINDOWS_VER="10"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export BASE_PFX="tflex17_pfx_x64_v01"
+export WINEARCH="win64"
+export WINEPREFIX="tflex17"
+export WH_XDG_OPEN="log"
+
+check_prefix_var
+if [[ ! -f "$WINEPREFIX/drive_c/Program Files/T-FLEX CAD 17/Program/TFlexCad.exe" ]]
+then fatal "Изначально установите T-FLEX CAD 17."
+fi
+
+BASE_URL="https://www.tflex.ru/downloads"
+FILES=(
+    "T-FLEX Tutorial 17.zip"
+    "Standard parts 17.zip"
+    "Elements of sealing technology 17.zip"
+    "Machine tools 17.zip"
+    "Standard parts for sheet metal dies 17.zip"
+    "Standard Mold Parts 17.zip"
+    "Examples 17.zip"
+)
+UNPACK_RESOURCES="${WH_TMP_DIR}/unpack_resources"
+
+prepair_wine
+
+# Скачивание всех файлов
+for file_name in "${FILES[@]}" ; do
+    local output="${WH_TMP_DIR}/${file_name// /_}"
+
+    if try_download "$BASE_URL/$file_name" "$output" ; then
+        unpack "$output" "$UNPACK_RESOURCES"
+    fi
+    try_remove_file "$output"
+done
+
+# Установка .msi файлов
+for msi_file in "${UNPACK_RESOURCES}"/*/*.msi ; do
+    if [[ -f "$msi_file" ]] ; then
+        wine_run_install "$msi_file" /q
+    else
+        fatal "Нет .msi файлов для установки в ${UNPACK_RESOURCES}/unpack_dop/*."
+    fi
+done
+
+try_remove_dir "${UNPACK_RESOURCES}"
--- a/autoinstall/t-flex-cad2d+17
+++ b/autoinstall/t-flex-cad2d+17
@@ -2,75 +2,16 @@
 # info_ru: Профессиональная САПР, объединяющая в себе мощные параметрические возможности 2D и 3D-моделирования со средствами создания и оформления чертежей и конструкторской документации по ЕСКД.
 ########################################################################
 export PROG_NAME="T-FLEX CAD 2D+ 17"
-export WH_WINDOWS_VER="10"
-export WH_WINE_USE="wine_x_tkg_10-0_amd64"
-export BASE_PFX="tflex17_pfx_x64_v01"
-export WINEARCH="win64"
-export WINEPREFIX="tflex17"
-export PROG_VERSION=""
 export PROG_ICON="tflexcad"
-export INSTALL_DLL="corefonts d3dcompiler_47 dotnet48 vcrun2019 ucrtbase2019 msxml6 fontsmooth=rgb baekmuk droid eufonts ipamona liberation lucida opensymbol sourcehansans tahoma takao uff unifont vlgothic wenquanyi wenquanyizenhei"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export WINEARCH="win64"
+export WH_WINDOWS_VER="10"
+export WINEPREFIX="tflex17"
+export WH_XDG_OPEN="log"

-prepair_wine
-if [[ "$BASE_PFX" == "none" ]] \
-|| ! systemctl list-units --type service --state running | grep aksusbd \
-|| ! systemctl list-units --type service --state running | grep hasplmd
-then
-    # Компоненты поддержки T-FLEX PLM 17 (Linux)
-    AUTOINSTALL_ZIP_LIN="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux.zip"
-    AUTOINSTALL_DIR_LIN="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux"
-    AUTOINSTALL_EXE_LIN1="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/fake_hasp.reg"
-    if try_download "https://www.tflex.ru/downloads/Prerequisites_T-FLEX_17_Linux.zip" "${AUTOINSTALL_ZIP_LIN}" ; then
-        7z x -y "${AUTOINSTALL_ZIP_LIN}" -o"${AUTOINSTALL_DIR_LIN}"
-        try_remove_file "$AUTOINSTALL_ZIP_LIN"
-        "$WINELOADER" regedit "${AUTOINSTALL_EXE_LIN1}"
-    fi
-
-    if [[ "$BASE_PFX" == "none" ]] ; then
-        # Компоненты поддержки T-FLEX PLM 17 (Windows)
-        AUTOINSTALL_ZIP_WIN="${WH_TMP_DIR}/T-FLEX 17 Prerequisites.zip"
-        AUTOINSTALL_DIRWIN="${WH_TMP_DIR}"
-        AUTOINSTALL_EXE_WIN1="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/Access Database Engine 2007/AccessDatabaseEngine.exe"
-        AUTOINSTALL_EXE_WIN_MSY="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/Access Database Engine 2007"
-        AUTOINSTALL_EXE_WIN2="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/TSC2/Setup_TSC2.msi"
-        if try_download "https://www.tflex.ru/downloads/T-FLEX%2017%20Prerequisites.zip" "${AUTOINSTALL_ZIP_WIN}" ; then
-            7z x -y "${AUTOINSTALL_ZIP_WIN}" -o"${AUTOINSTALL_DIRWIN}"
-            try_remove_file "$AUTOINSTALL_ZIP_WIN"
-
-            7z x -y "${AUTOINSTALL_EXE_WIN1}" -o"${AUTOINSTALL_EXE_WIN_MSY}"
-            try_remove_file "$AUTOINSTALL_EXE_WIN1"
-
-            wine_run_install "${AUTOINSTALL_EXE_WIN_MSY}/AceRedist.msi" /q
-            wine_run_install "${AUTOINSTALL_EXE_WIN2}" /q
-        fi
-        rm -fR "$DRIVE_C/Program Files/Common Files/System"
-        rm -fR "$DRIVE_C/Program Files (x86)/Common Files/System"
-        cp -r "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Program Files/Common Files/System" "$DRIVE_C/Program Files/Common Files"
-        cp -r "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Program Files (x86)/Common Files/System" "$DRIVE_C/Program Files (x86)/Common Files"
-        mv -f "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Windows/System32/"*.dll "$DRIVE_C/windows/system32"
-
-        "$WINELOADER" regedit "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/ado-32.reg"
-        "$WINELOADER"64 regedit "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/ado-64.reg"
-        "$WINELOADER" regedit "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/tflex.reg"
-    fi
-
-    if systemctl list-units --type service --state running | grep aksusbd \
-    && systemctl list-units --type service --state running | grep hasplmd
-    then
-        print_info "Службы aksusbd и hasplmd уже запущены. Пропускаем..."
-    else
-        echo "#!/usr/bin/env bash
-        cd \"${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/HASP_Linux/aksusbd/\"
-        bash ./dinst
-        mv -f \"${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/HASP_Linux/\"*.so /var/hasplm/
-        systemctl restart hasplmd.service" > "${WH_TMP_DIR}/tflex17_aksusbd.sh"
-        chmod +x ${WH_TMP_DIR}/tflex17_aksusbd.sh
-        su_run "${WH_TMP_DIR}/tflex17_aksusbd.sh"
-        try_remove_file "${WH_TMP_DIR}/tflex17_aksusbd.sh"
-    fi
-    try_remove_dir "$AUTOINSTALL_DIR_LIN"
-    try_remove_dir "${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/"
-fi
+# используем общий whdb файл для подготовки префикса и сервисов
+# prepair_wine используется из файла настроек
+source "$WH_DB_DIR/t-flex-cad17.whdb"

 # Программа T-FLEX CAD 2D+ 17
 export AUTOINSTALL_ZIP="${WH_TMP_DIR}/T-FLEX CAD 2D+ 17.zip"
@@ -78,7 +19,7 @@ export AUTOINSTALL_DIR="${WH_TMP_DIR}"
 export AUTOINSTALL_EXE="${WH_TMP_DIR}/T-FLEX CAD 2D+ 17/T-FLEX CAD 2D+ 17.msi"

 if try_download "https://www.tflex.ru/downloads/T-FLEX%20CAD%202D+%2017.zip" "${AUTOINSTALL_ZIP}" ; then
-    7z x -y "${AUTOINSTALL_ZIP}" -o"${AUTOINSTALL_DIR}"
+    unpack "${AUTOINSTALL_ZIP}" "${AUTOINSTALL_DIR}"
    try_remove_file "${AUTOINSTALL_ZIP}"

    wine_run_install "${AUTOINSTALL_EXE}" /q
--- a/autoinstall/t-flex-doc17
+++ b/autoinstall/t-flex-doc17
@@ -2,77 +2,16 @@
 # info_ru: Система T-FLEX DOCs предназначена для комплексного управления инженерными данными предприятия, а также решения задач конструкторско-технологического и организационно-распорядительного документооборота.
 ########################################################################
 export PROG_NAME="T-FLEX DOCs 17"
-export WH_WINDOWS_VER="10"
-export WH_WINE_USE="wine_x_tkg_10-0_amd64"
-export BASE_PFX="tflex17_pfx_x64_v01"
-export WINEARCH="win64"
-export WINEPREFIX="tflex17"
-export PROG_VERSION=""
 export PROG_ICON="tflexdoc"
-export INSTALL_DLL="vcrun2019 d3dcompiler_47 dotnet48 msxml6 fontsmooth=rgb corefonts"
-# eucrtbase2019 baekmuk droid eufonts ipamona liberation lucida opensymbol sourcehansans tahoma takao uff unifont  vlgothic wenquanyi wenquanyizenhei
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export WINEARCH="win64"
+export WH_WINDOWS_VER="10"
+export WINEPREFIX="tflex17"
+export WH_XDG_OPEN="log"

-prepair_wine
-
-if [[ "$BASE_PFX" == "none" ]] \
-|| ! systemctl list-units --type service --state running | grep aksusbd \
-|| ! systemctl list-units --type service --state running | grep hasplmd
-then
-    # Компоненты поддержки T-FLEX PLM 17 (Linux)
-    AUTOINSTALL_ZIP_LIN="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux.zip"
-    AUTOINSTALL_DIR_LIN="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux"
-    AUTOINSTALL_EXE_LIN1="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/fake_hasp.reg"
-    if try_download "https://www.tflex.ru/downloads/Prerequisites_T-FLEX_17_Linux.zip" "${AUTOINSTALL_ZIP_LIN}" ; then
-        7z x -y "${AUTOINSTALL_ZIP_LIN}" -o"${AUTOINSTALL_DIR_LIN}"
-        try_remove_file "$AUTOINSTALL_ZIP_LIN"
-        "$WINELOADER" regedit "${AUTOINSTALL_EXE_LIN1}"
-    fi
-
-    if [[ "$BASE_PFX" == "none" ]] ; then
-        # Компоненты поддержки T-FLEX PLM 17 (Windows)
-        AUTOINSTALL_ZIP_WIN="${WH_TMP_DIR}/T-FLEX 17 Prerequisites.zip"
-        AUTOINSTALL_DIRWIN="${WH_TMP_DIR}"
-        AUTOINSTALL_EXE_WIN1="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/Access Database Engine 2007/AccessDatabaseEngine.exe"
-        AUTOINSTALL_EXE_WIN_MSY="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/Access Database Engine 2007"
-        AUTOINSTALL_EXE_WIN2="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/TSC2/Setup_TSC2.msi"
-        if try_download "https://www.tflex.ru/downloads/T-FLEX%2017%20Prerequisites.zip" "${AUTOINSTALL_ZIP_WIN}" ; then
-            7z x -y "${AUTOINSTALL_ZIP_WIN}" -o"${AUTOINSTALL_DIRWIN}"
-            try_remove_file "$AUTOINSTALL_ZIP_WIN"
-
-            7z x -y "${AUTOINSTALL_EXE_WIN1}" -o"${AUTOINSTALL_EXE_WIN_MSY}"
-            try_remove_file "$AUTOINSTALL_EXE_WIN1"
-
-            wine_run_install "${AUTOINSTALL_EXE_WIN_MSY}/AceRedist.msi" /q
-            wine_run_install "${AUTOINSTALL_EXE_WIN2}" /q
-        fi
-        rm -fR "$DRIVE_C/Program Files/Common Files/System"
-        rm -fR "$DRIVE_C/Program Files (x86)/Common Files/System"
-        cp -r "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Program Files/Common Files/System" "$DRIVE_C/Program Files/Common Files"
-        cp -r "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Program Files (x86)/Common Files/System" "$DRIVE_C/Program Files (x86)/Common Files"
-        mv -f "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Windows/System32/"*.dll "$DRIVE_C/windows/system32"
-
-        "$WINELOADER" regedit "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/ado-32.reg"
-        "$WINELOADER"64 regedit "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/ado-64.reg"
-        "$WINELOADER" regedit "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/tflex.reg"
-    fi
-
-    if systemctl list-units --type service --state running | grep aksusbd \
-    && systemctl list-units --type service --state running | grep hasplmd
-    then
-        print_info "Службы aksusbd и hasplmd уже запущены. Пропускаем..."
-    else
-        echo "#!/usr/bin/env bash
-        cd \"${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/HASP_Linux/aksusbd/\"
-        bash ./dinst
-        mv -f \"${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/HASP_Linux/\"*.so /var/hasplm/
-        systemctl restart hasplmd.service" > "${WH_TMP_DIR}/tflex17_aksusbd.sh"
-        chmod +x ${WH_TMP_DIR}/tflex17_aksusbd.sh
-        su_run "${WH_TMP_DIR}/tflex17_aksusbd.sh"
-        try_remove_file "${WH_TMP_DIR}/tflex17_aksusbd.sh"
-    fi
-    try_remove_dir "$AUTOINSTALL_DIR_LIN"
-    try_remove_dir "${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/"
-fi
+# используем общий whdb файл для подготовки префикса и сервисов
+# prepair_wine используется из файла настроек
+source "$WH_DB_DIR/t-flex-cad17.whdb"

 # Программа T-FLEX DOC
 AUTOINSTALL_ZIP="${WH_TMP_DIR}/T-FLEX DOCs 17 Client.zip"
@@ -80,7 +19,7 @@ AUTOINSTALL_DIR="${WH_TMP_DIR}/T-FLEX DOCs 17"
 AUTOINSTALL_EXE="${WH_TMP_DIR}/T-FLEX DOCs 17/T-FLEX DOCs 17/T-FLEX DOCs 17.msi"

 if try_download "https://www.tflex.ru/downloads/DOCs/T-FLEX%20DOCs%2017%20Client.zip" "${AUTOINSTALL_ZIP}" ; then
-    7z x -y "${AUTOINSTALL_ZIP}" -o"${AUTOINSTALL_DIR}"
+    unpack "${AUTOINSTALL_ZIP}" "${AUTOINSTALL_DIR}"
    try_remove_file "${AUTOINSTALL_ZIP}"

    wine_run_install "${AUTOINSTALL_EXE}" /q
--- a/autoinstall/t-flex-viewer17
+++ b/autoinstall/t-flex-viewer17
@@ -2,75 +2,16 @@
 # info_ru: Просмотр, печать и аннотирование документов T-FLEX CAD
 ########################################################################
 export PROG_NAME="T-FLEX Viewer 17"
-export WH_WINDOWS_VER="10"
-export WH_WINE_USE="wine_x_tkg_10-0_amd64"
-export BASE_PFX="tflex17_pfx_x64_v01"
-export WINEARCH="win64"
-export WINEPREFIX="tflex17"
-export PROG_VERSION=""
 export PROG_ICON="tflexcad"
-export INSTALL_DLL="corefonts d3dcompiler_47 dotnet48 vcrun2019 ucrtbase2019 msxml6 fontsmooth=rgb baekmuk droid eufonts ipamona liberation lucida opensymbol sourcehansans tahoma takao uff unifont vlgothic wenquanyi wenquanyizenhei"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export WINEARCH="win64"
+export WH_WINDOWS_VER="10"
+export WINEPREFIX="tflex17"
+export WH_XDG_OPEN="log"

-prepair_wine
-if [[ "$BASE_PFX" == "none" ]] \
-|| ! systemctl list-units --type service --state running | grep aksusbd \
-|| ! systemctl list-units --type service --state running | grep hasplmd
-then
-    # Компоненты поддержки T-FLEX PLM 17 (Linux)
-    AUTOINSTALL_ZIP_LIN="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux.zip"
-    AUTOINSTALL_DIR_LIN="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux"
-    AUTOINSTALL_EXE_LIN1="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/fake_hasp.reg"
-    if try_download "https://www.tflex.ru/downloads/Prerequisites_T-FLEX_17_Linux.zip" "${AUTOINSTALL_ZIP_LIN}" ; then
-        7z x -y "${AUTOINSTALL_ZIP_LIN}" -o"${AUTOINSTALL_DIR_LIN}"
-        try_remove_file "$AUTOINSTALL_ZIP_LIN"
-        "$WINELOADER" regedit "${AUTOINSTALL_EXE_LIN1}"
-    fi
-
-    if [[ "$BASE_PFX" == "none" ]] ; then
-        # Компоненты поддержки T-FLEX PLM 17 (Windows)
-        AUTOINSTALL_ZIP_WIN="${WH_TMP_DIR}/T-FLEX 17 Prerequisites.zip"
-        AUTOINSTALL_DIRWIN="${WH_TMP_DIR}"
-        AUTOINSTALL_EXE_WIN1="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/Access Database Engine 2007/AccessDatabaseEngine.exe"
-        AUTOINSTALL_EXE_WIN_MSY="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/Access Database Engine 2007"
-        AUTOINSTALL_EXE_WIN2="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/TSC2/Setup_TSC2.msi"
-        if try_download "https://www.tflex.ru/downloads/T-FLEX%2017%20Prerequisites.zip" "${AUTOINSTALL_ZIP_WIN}" ; then
-            7z x -y "${AUTOINSTALL_ZIP_WIN}" -o"${AUTOINSTALL_DIRWIN}"
-            try_remove_file "$AUTOINSTALL_ZIP_WIN"
-
-            7z x -y "${AUTOINSTALL_EXE_WIN1}" -o"${AUTOINSTALL_EXE_WIN_MSY}"
-            try_remove_file "$AUTOINSTALL_EXE_WIN1"
-
-            wine_run_install "${AUTOINSTALL_EXE_WIN_MSY}/AceRedist.msi" /q
-            wine_run_install "${AUTOINSTALL_EXE_WIN2}" /q
-        fi
-        rm -fR "$DRIVE_C/Program Files/Common Files/System"
-        rm -fR "$DRIVE_C/Program Files (x86)/Common Files/System"
-        cp -r "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Program Files/Common Files/System" "$DRIVE_C/Program Files/Common Files"
-        cp -r "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Program Files (x86)/Common Files/System" "$DRIVE_C/Program Files (x86)/Common Files"
-        mv -f "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Windows/System32/"*.dll "$DRIVE_C/windows/system32"
-
-        "$WINELOADER" regedit "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/ado-32.reg"
-        "$WINELOADER"64 regedit "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/ado-64.reg"
-        "$WINELOADER" regedit "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/tflex.reg"
-    fi
-
-    if systemctl list-units --type service --state running | grep aksusbd \
-    && systemctl list-units --type service --state running | grep hasplmd
-    then
-        print_info "Службы aksusbd и hasplmd уже запущены. Пропускаем..."
-    else
-        echo "#!/usr/bin/env bash
-        cd \"${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/HASP_Linux/aksusbd/\"
-        bash ./dinst
-        mv -f \"${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/HASP_Linux/\"*.so /var/hasplm/
-        systemctl restart hasplmd.service" > "${WH_TMP_DIR}/tflex17_aksusbd.sh"
-        chmod +x ${WH_TMP_DIR}/tflex17_aksusbd.sh
-        su_run "${WH_TMP_DIR}/tflex17_aksusbd.sh"
-        try_remove_file "${WH_TMP_DIR}/tflex17_aksusbd.sh"
-    fi
-    try_remove_dir "$AUTOINSTALL_DIR_LIN"
-    try_remove_dir "${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/"
-fi
+# используем общий whdb файл для подготовки префикса и сервисов
+# prepair_wine используется из файла настроек
+source "$WH_DB_DIR/t-flex-cad17.whdb"

 # Программа T-FLEX Viewer
 export AUTOINSTALL_ZIP="${WH_TMP_DIR}/T-FLEX Viewer 17.zip"
@@ -78,7 +19,7 @@ export AUTOINSTALL_DIR="${WH_TMP_DIR}"
 export AUTOINSTALL_EXE="${WH_TMP_DIR}/T-FLEX Viewer 17/T-FLEX Viewer 17.msi"

 if try_download "https://www.tflex.ru/downloads/T-FLEX%20Viewer%2017.zip" "${AUTOINSTALL_ZIP}" ; then
-    7z x -y "${AUTOINSTALL_ZIP}" -o"${AUTOINSTALL_DIR}"
+    unpack "${AUTOINSTALL_ZIP}" "${AUTOINSTALL_DIR}"
    try_remove_file "${AUTOINSTALL_ZIP}"

    wine_run_install "${AUTOINSTALL_EXE}" /q
--- a/autoinstall/ved-alf
+++ b/autoinstall/ved-alf
@@ -18,7 +18,7 @@ AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_al"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_al/setup.exe"

 if try_download "https://ftp.ctm.ru/ALPHABET/SFX/setup_al.exe" "${AUTOINSTALL_EXE}" ; then
-    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
    try_remove_file "$AUTOINSTALL_EXE"

    wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\ALPHABET" /auto /hide
--- a/autoinstall/ved-control
+++ b/autoinstall/ved-control
@@ -18,7 +18,7 @@ AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_cl"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_cl/setup.exe"

 if try_download "https://ftp.ctm.ru/CONTROL/SFX/setup_cl.exe" "${AUTOINSTALL_EXE}" ; then
-    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
    try_remove_file "$AUTOINSTALL_EXE"

    wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\CONTROL" /auto /hide
--- a/autoinstall/ved-dcl
+++ b/autoinstall/ved-dcl
@@ -18,7 +18,7 @@ AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_dl"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_dl/setup.exe"

 if try_download "https://ftp.ctm.ru/DCL/SFX/setup_dl.exe" "${AUTOINSTALL_EXE}" ; then
-    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
    try_remove_file "$AUTOINSTALL_EXE"

    wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\DCL" /auto /hide
--- a/autoinstall/ved-info
+++ b/autoinstall/ved-info
@@ -18,7 +18,7 @@ AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_vi"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_vi/setup.exe"

 if try_download "https://ftp.ctm.ru/VEDINFO/SFX/setup_vi.exe" "${AUTOINSTALL_EXE}" ; then
-    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
    try_remove_file "$AUTOINSTALL_EXE"

    wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\VED_INFO" /auto /hide
--- a/autoinstall/ved-payments
+++ b/autoinstall/ved-payments
@@ -18,7 +18,7 @@ AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_pa"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_pa/setup.exe"

 if try_download "https://ftp.ctm.ru/PAYMENT/SFX/setup_pa.exe" "${AUTOINSTALL_EXE}" ; then
-    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
    try_remove_file "$AUTOINSTALL_EXE"

    wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\PAYMENT" /auto /hide
--- a/autoinstall/ved-sts
+++ b/autoinstall/ved-sts
@@ -18,7 +18,7 @@ AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_st"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_st/setup.exe"

 if try_download "https://ftp.ctm.ru/STS/SFX/setup_st.exe" "${AUTOINSTALL_EXE}" ; then
-    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
    try_remove_file "$AUTOINSTALL_EXE"

    wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\STS" /auto /hide
--- a/database/empty
+++ b/database/empty
--- a/database/t-flex-cad17.whdb
+++ b/database/t-flex-cad17.whdb
@@ -0,0 +1,93 @@
+#!/usr/bin/env bash
+# info_ru: Компоненты сервисов поддержки T-FLEX 17
+########################################################################
+export WH_WINDOWS_VER="10"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export BASE_PFX="tflex17_pfx_x64_v01"
+export WINEARCH="win64"
+export WINEPREFIX="tflex17"
+export PROG_VERSION=""
+export WH_XDG_OPEN="log"
+export INSTALL_DLL="corefonts d3dcompiler_47 dotnet48 vcrun2022 ucrtbase2019 msxml6 fontsmooth=rgb baekmuk droid eufonts ipamona liberation lucida opensymbol sourcehansans tahoma takao uff unifont vlgothic wenquanyi wenquanyizenhei"
+
+prepair_wine
+
+if [[ -d "$WINEPREFIX" ]] \
+&& grep -q "t-flex-cad17-prepair" "$WINEPREFIX/winetricks.log" \
+&& systemctl list-units --type service --state running | grep aksusbd \
+&& systemctl list-units --type service --state running | grep hasplmd
+then
+    print_info "Префикс $PREFIX_NAME готов к установке ПО."
+    print_info "Сервисы: aksusbd и hasplmd уже запущены."
+else
+    print_warning "Службы aksusbd и hasplmd не запущены, или префикс не подготовлен"
+    print_info "Запускаем подготовку префикса скриптом: t-flex-cad17-prepair"
+
+    if [[ "$BASE_PFX" == "none" ]] \
+    || ! systemctl list-units --type service --state running | grep aksusbd \
+    || ! systemctl list-units --type service --state running | grep hasplmd
+    then
+        # Компоненты поддержки T-FLEX PLM 17 (Linux)
+        AUTOINSTALL_ZIP_LIN="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux.zip"
+        AUTOINSTALL_DIR_LIN="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux"
+        AUTOINSTALL_EXE_LIN1="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/fake_hasp.reg"
+        if try_download "https://www.tflex.ru/downloads/Prerequisites_T-FLEX_17_Linux.zip" "${AUTOINSTALL_ZIP_LIN}" ; then
+            unpack "${AUTOINSTALL_ZIP_LIN}" "${AUTOINSTALL_DIR_LIN}"
+            try_remove_file "$AUTOINSTALL_ZIP_LIN"
+            "$WINELOADER" regedit "${AUTOINSTALL_EXE_LIN1}"
+        fi
+
+        if [[ "$BASE_PFX" == "none" ]] ; then
+            # Компоненты поддержки T-FLEX PLM 17 (Windows)
+            AUTOINSTALL_ZIP_WIN="${WH_TMP_DIR}/T-FLEX 17 Prerequisites.zip"
+            AUTOINSTALL_DIRWIN="${WH_TMP_DIR}"
+            AUTOINSTALL_EXE_WIN1="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/Access Database Engine 2007/AccessDatabaseEngine.exe"
+            AUTOINSTALL_EXE_WIN_MSY="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/Access Database Engine 2007"
+            AUTOINSTALL_EXE_WIN2="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/TSC2/Setup_TSC2.msi"
+            if try_download "https://www.tflex.ru/downloads/T-FLEX%2017%20Prerequisites.zip" "${AUTOINSTALL_ZIP_WIN}" ; then
+                unpack "${AUTOINSTALL_ZIP_WIN}" "${AUTOINSTALL_DIRWIN}"
+                try_remove_file "$AUTOINSTALL_ZIP_WIN"
+
+                unpack "${AUTOINSTALL_EXE_WIN1}" "${AUTOINSTALL_EXE_WIN_MSY}"
+                try_remove_file "$AUTOINSTALL_EXE_WIN1"
+
+                wine_run_install "${AUTOINSTALL_EXE_WIN_MSY}/AceRedist.msi" /q
+                wine_run_install "${AUTOINSTALL_EXE_WIN2}" /q
+            fi
+            rm -fR "$DRIVE_C/Program Files/Common Files/System"
+            rm -fR "$DRIVE_C/Program Files (x86)/Common Files/System"
+            cp -r "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Program Files/Common Files/System" "$DRIVE_C/Program Files/Common Files"
+            cp -r "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Program Files (x86)/Common Files/System" "$DRIVE_C/Program Files (x86)/Common Files"
+            mv -f "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Windows/System32/"*.dll "$DRIVE_C/windows/system32"
+
+            "$WINELOADER" regedit "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/ado-32.reg"
+            "$WINELOADER"64 regedit "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/ado-64.reg"
+            "$WINELOADER" regedit "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/tflex.reg"
+        fi
+
+        if systemctl list-units --type service --state running | grep aksusbd \
+        && systemctl list-units --type service --state running | grep hasplmd
+        then
+            print_info "Службы aksusbd и hasplmd уже запущены. Пропускаем..."
+        else
+            echo "#!/usr/bin/env bash
+            cd \"${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/HASP_Linux/aksusbd/\"
+            bash ./dinst
+            mv -f \"${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/HASP_Linux/\"*.so /var/hasplm/
+            systemctl restart hasplmd.service" > "${WH_TMP_DIR}/tflex17_aksusbd.sh"
+            chmod +x ${WH_TMP_DIR}/tflex17_aksusbd.sh
+            unset TFLEX_ERROR
+            su_run "${WH_TMP_DIR}/tflex17_aksusbd.sh" || TFLEX_ERROR=1
+            try_remove_file "${WH_TMP_DIR}/tflex17_aksusbd.sh"
+        fi
+        try_remove_dir "$AUTOINSTALL_DIR_LIN"
+        try_remove_dir "${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/"
+    fi
+
+    if [[ $TFLEX_ERROR == "1" ]] ; then
+        fatal "Произошла ошибка во время подготовки префикса, или установки компонентов ПО."
+    else
+        echo "t-flex-cad17-prepair" >> "$WINEPREFIX/winetricks.log"
+        print_info "Подготовка префикса и установка компонентов завершены."
+    fi
+fi
--- a/manualinstall/daobit-cservice
+++ b/manualinstall/daobit-cservice
@@ -16,7 +16,7 @@ EXE_SETUP_NAME="setup_cs.exe"
 if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then
    prepair_wine

-    7z x -y "$2" -o"${AUTOINSTALL_UNPACK}"
+    unpack "$2" "${AUTOINSTALL_UNPACK}"
    wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\DAO\\\\CSERVICE" /auto /hide

    WIN_FILE_EXEC="$DRIVE_C/Program Files/DAO/CSERVICE/CService32.exe"
--- a/manualinstall/daobit-ratlas
+++ b/manualinstall/daobit-ratlas
@@ -16,7 +16,7 @@ EXE_SETUP_NAME="setup_rk.exe"
 if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then
    prepair_wine

-    7z x -y "$2" -o"${AUTOINSTALL_UNPACK}"
+    unpack "$2" "${AUTOINSTALL_UNPACK}"
    wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\DAO\\\\RAtlas" /auto /hide

    WIN_FILE_EXEC="$DRIVE_C/Program Files/DAO/RAtlas/ratlas.exe"
--- a/manualinstall/daobit-rinfo
+++ b/manualinstall/daobit-rinfo
@@ -16,7 +16,7 @@ EXE_SETUP_NAME="setup_ri.exe"
 if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then
    prepair_wine

-    7z x -y "$2" -o"${AUTOINSTALL_UNPACK}"
+    unpack "$2" "${AUTOINSTALL_UNPACK}"
    wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\DAO\\\\RInfo" /auto /hide

    WIN_FILE_EXEC="$DRIVE_C/Program Files/DAO/RInfo/rinfo.exe"
--- a/manualinstall/daobit-rtariff
+++ b/manualinstall/daobit-rtariff
@@ -16,7 +16,7 @@ EXE_SETUP_NAME="setup_rt.exe"
 if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then
    prepair_wine

-    7z x -y "$2" -o"${AUTOINSTALL_UNPACK}"
+    unpack "$2" "${AUTOINSTALL_UNPACK}"
    wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\DAO\\\\RTariff" /auto /hide

    WIN_FILE_EXEC="$DRIVE_C/Program Files/DAO/RTariff/Tariff.exe"
--- a/manualinstall/t-flex-cad17-manual
+++ b/manualinstall/t-flex-cad17-manual
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+# info_ru: Ручная установка дополнений для T-FLEX CAD 17
+########################################################################
+export PROG_NAME="T-FLEX CAD 17"
+export PROG_ICON="tflexcad"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export WINEARCH="win64"
+export WH_WINDOWS_VER="10"
+export WINEPREFIX="tflex17"
+export WH_XDG_OPEN="log"
+
+if [[ -f "$2" ]] ; then
+    # используем общий whdb файл для подготовки префикса и сервисов
+    # prepair_wine используется из файла настроек
+    source "$WH_DB_DIR/t-flex-cad17.whdb"
+
+    wine_run_install "$2"
+else
+    fatal "Не найден файл установки. Перезапустите по примеру:
+    winehelper install $1 \"/путь/до/файла\""
+fi
--- a/67
+++ b/67
@@ -6,6 +6,27 @@ if [[ $(id -u) -eq 0 ]] ; then
    exit 1
 fi

+##### DEFAULT PATH #####
+SCRIPT_NAME="$(basename "$0")"
+if [[ "$(realpath "$0")" == "/usr/bin/$SCRIPT_NAME" ]] ; then
+    # переменные для установленного WineHelper в систему
+    USER_WORK_PATH="$HOME/.local/share/$SCRIPT_NAME"
+    RUN_SCRIPT="/usr/bin/$SCRIPT_NAME"
+    DATA_PATH="/usr/share/$SCRIPT_NAME"
+else
+    # переменные для тестового запуска WineHelper из репозитория
+    USER_WORK_PATH="$HOME/test-$SCRIPT_NAME"
+    RUN_SCRIPT="$(realpath "$0")"
+    DATA_PATH="$(dirname "$RUN_SCRIPT")"
+
+    # минимальная проверка синтаксиса скриптов
+    for self_check_script in "$RUN_SCRIPT" \
+    "$DATA_PATH/dependencies.sh" "$DATA_PATH/autoinstall"/* \
+    "$DATA_PATH/manualinstall"/* "$DATA_PATH/database"/*
+    do /usr/bin/env bash -n "$self_check_script" || exit 1
+    done
+fi
+
 ##### MESSAGES FUNCTIONS #####
 print_error () { printf "\E[31m%s Ошибка: $@ %s\e[0m\n" ;}
 print_warning () { printf "\E[33m%s Предупреждение: $@ %s\e[0m\n" ;}
@@ -53,17 +74,6 @@ fi
 WINETRICKS_VERSION="20250102"

 ##### DEFAULT VARIABLES #####
-SCRIPT_NAME="$(basename "$0")"
-if [[ "$(realpath "$0")" == "/usr/bin/$SCRIPT_NAME" ]] ; then
-    USER_WORK_PATH="$HOME/.local/share/$SCRIPT_NAME"
-    RUN_SCRIPT="/usr/bin/$SCRIPT_NAME"
-    DATA_PATH="/usr/share/$SCRIPT_NAME"
-else
-    USER_WORK_PATH="$HOME/test-$SCRIPT_NAME"
-    RUN_SCRIPT="$(realpath "$0")"
-    DATA_PATH="$(dirname "$RUN_SCRIPT")"
-fi
-
 WH_VULKAN_LIBDIR="$USER_WORK_PATH/vulkan"
 WH_PREFIXES_DIR="$USER_WORK_PATH/prefixes"
 WH_DIST_DIR="$USER_WORK_PATH/dist"
@@ -228,24 +238,25 @@ create_new_dir () {

 unpack () {
    print_info "Запуск распаковки архива $1"
+    local command outarg
    case $1 in
-         *.tar.xz) local command="tar -Jxhf";;
-         *.tar.gz) local command="tar -xhzf" ;;
-        *.tar.zst) local command="tar -I zstd -xhf" ;;
-            *.tar) local command="tar -xhf" ;;
+         *.tar.xz) command="tar -Jxhf" ; outarg="-C " ;;
+         *.tar.gz) command="tar -xhzf" ; outarg="-C " ;;
+        *.tar.zst) command="tar -I zstd -xhf" ; outarg="-C " ;;
+            *.tar) command="tar -xhf" ; outarg="-C " ;;
+      *.zip|*.exe) command="7z x -y" ; outarg="-o" ;;
    esac
    create_new_dir "$2"
-    if $command "$1" -C "$2" ; then
-        print_ok "Архив $1 распакован."
+    if $command "$1" ${outarg}"$2" ; then
+        print_ok "Файл $1 распакован."
        return 0
    else
-        print_error "Распаковать архив $1 не удалось!"
-        return 1
+        fatal "Распаковать файл $1 не удалось!"
    fi
 }

 try_download () {
-    local DOWNLOAD_FILE_URL="$1"
+    local DOWNLOAD_FILE_URL="${1// /%20}"
    local OUTPUT_FILE="$2"
    local OUTPUT_FILE_NAME="$(basename "$OUTPUT_FILE")"

@@ -889,11 +900,6 @@ init_wineprefix () {

    export DRIVE_C="$WINEPREFIX/drive_c"

-    create_new_dir "$WINEPREFIX/dosdevices/"
-    if [[ ! -L "$WINEPREFIX/dosdevices/h:" ]]
-    then try_force_link_dir "$HOME" "$WINEPREFIX/dosdevices/h:"
-    fi
-
    if [[ ! -f "$WINEPREFIX/.firstboot" ]] ; then
        create_new_dir "$WINEPREFIX"
        if [[ "$CLEAR_PREFIX" == "1" ]]
@@ -929,14 +935,23 @@ init_wineprefix () {
    fi

    if [[ ! -f "$WINEPREFIX/.update-timestamp" ]] ; then
+        print_info "Обновление префикса $WINEPREFIX."
        "$WINELOADER" wineboot -u
        wait_wineserver
    fi

+    if [[ ! -L "$WINEPREFIX/dosdevices/h:" ]]
+    then try_force_link_dir "$HOME" "$WINEPREFIX/dosdevices/h:"
+    fi
+
    try_remove_file "$DRIVE_C/windows/system32/winemenubuilder.exe"

    # хак для XRDP сессии
    if [[ $DISPLAY == *:10.0 ]] ; then
+        if ! lspci | grep -i nvidia > /dev/null ; then
+            export MESA_GL_VERSION_OVERRIDE="3.3"
+            export MESA_GLSL_VERSION_OVERRIDE="330"
+        fi
        print_warning "Обнаружена сессия XRDP, настраиваем реестр:"
        get_and_set_reg_file --add 'Software\Wine\X11 Driver' 'UseXRandR' 'REG_SZ' "N" "user"
        get_and_set_reg_file --add 'Software\Wine\X11 Driver' 'UseXVidMode' 'REG_SZ' "N" "user"
@@ -1164,7 +1179,7 @@ wine_run () {
 }

 wine_run_install () {
-    print_info "Запускаем установку приложения $PROG_NAME."
+    print_info "Запускаем установку: $1."
    if [[ "$INSTALL_MODE" == "manual" ]]
    then print_warning "Рекомендуется не менять пути для установки приложения!"
    fi
Author	SHA1	Message	Date
Mikhail Tergoev	00bd907416	updated changelog to 0.4.5	2025-06-19 16:55:44 +03:00
Mikhail Tergoev	d118e320a7	self_check_script: /usr/bin/bash to /usr/bin/env bash	2025-06-19 16:53:30 +03:00
Mikhail Tergoev	625472f1be	updated changelog to 0.4.4	2025-06-19 16:33:38 +03:00
Mikhail Tergoev	fc7374fb54	t-flex-cad17: used only one settings file and fixed open log	2025-06-19 16:22:06 +03:00
Mikhail Tergoev	dac6ec13dc	updated hack XRDP for session	2025-06-19 16:05:39 +03:00
Mikhail Tergoev	fdc9de705b	unpack: fatal if error	2025-06-19 15:20:55 +03:00
Mikhail Tergoev	b9d1987b01	t-flex-cad: updated all scripts	2025-06-19 13:39:19 +03:00
Mikhail Tergoev	1a589f3b52	wine_run_install: fixed name files for install	2025-06-19 13:36:17 +03:00
Mikhail Tergoev	9ed6a4d61e	try_download: fixed url with space	2025-06-19 13:09:10 +03:00
Mikhail Tergoev	57a77b608d	used unpack in all scripts	2025-06-19 13:07:30 +03:00
Mikhail Tergoev	6b5d7736b6	added minimal self check	2025-06-19 12:20:10 +03:00
Mikhail Tergoev	6ad9d1a47f	unpack: added exe and zip	2025-06-19 11:41:52 +03:00
Mikhail Tergoev	d09b1a3439	Merge branch 'minergenon-doptflex'	2025-06-19 11:15:24 +03:00
Mikhail Tergoev	aca10b71fe	updated changelog to 0.4.3	2025-06-18 17:14:02 +03:00
Mikhail Tergoev	9c332106c3	fixed first update prefix	2025-06-18 17:13:04 +03:00
Sergey Palcheh	fbe8944a0f	autoinstall: added t-flex-cad17-applications, t-flex-cad17-resources	2025-05-26 17:28:58 +06:00