updated changelog to 0.4.5

CHANGELOG

@@ -1,5 +1,25 @@
 История изменений:
 
+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:
 * исправлено обновление префикса при первом запуске
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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
+# используем общий whdb файл для подготовки префикса и сервисов
-if [[ "$BASE_PFX" == "none" ]] \
+# prepair_wine используется из файла настроек
-|| ! systemctl list-units --type service --state running | grep aksusbd \
+source "$WH_DB_DIR/t-flex-cad17.whdb"
-|| ! 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
 
 # Программа 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

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
+# используем общий whdb файл для подготовки префикса и сервисов
-if [[ "$BASE_PFX" == "none" ]] \
+# prepair_wine используется из файла настроек
-|| ! systemctl list-units --type service --state running | grep aksusbd \
+source "$WH_DB_DIR/t-flex-cad17.whdb"
-|| ! 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
 
 # Программа 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

autoinstall/t-flex-cad17-applications

@@ -6,6 +6,12 @@ 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=(
@@ -22,46 +28,23 @@ UNPACK_APP="${WH_TMP_DIR}/unpack_applications"
 
 prepair_wine
 
-# Функция для распаковки файла
-unpack_file() {
-    local archive="$1"
-    7z x -y "$archive" -o"${UNPACK_APP}"
-}
-
-# Функция для установки .msi файлов
-install_msi_files() {
-    for msi_file in "${UNPACK_APP}"/*/*.msi; do
-        if [[ -f "$msi_file" ]]; then
-            echo "Установка $msi_file ..."
-            wine_run_install "$msi_file" /q
-        else
-            echo "Нет .msi файлов для установки в ${UNPACK_APP}/*."
-        fi
-    done
-}
-
-# Функция для кодирования URL
-encode_url() {
-    local file_name="$1"
-    echo "${file_name// /%20}"  # Заменяем пробелы на %20
-}
-
 # Скачивание всех файлов
-download_all() {
+for file_name in "${FILES[@]}" ; do
-    for file_name in "${FILES[@]}"; do
-        local file_url="$(encode_url "$file_name")"
     local output="${WH_TMP_DIR}/${file_name// /_}"
 
-        echo "Скачивание $file_name..."
+    if try_download "$BASE_URL/$file_name" "$output" ; then
-        if try_download "$BASE_URL/$file_url" "$output"; then
+        unpack "$output" "${UNPACK_APP}"
-            unpack_file "$output"
     fi
-    done
+    try_remove_file "$output"
-}
+done
 
-# Автоматически скачиваем и устанавливаем все файлы
+# Установка .msi файлов
-download_all
+for msi_file in "${UNPACK_APP}"/*/*.msi ; do
-install_msi_files
+    if [[ -f "$msi_file" ]] ; then
+        wine_run_install "$msi_file" /q
+    else
+        fatal "Нет .msi файлов для установки в ${UNPACK_APP}/*."
+    fi
+done
 
-rm -f ${WH_TMP_DIR}/*.zip
 try_remove_dir "${UNPACK_APP}"

autoinstall/t-flex-cad17-resources

@@ -6,6 +6,12 @@ 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=(
@@ -20,46 +26,24 @@ FILES=(
 UNPACK_RESOURCES="${WH_TMP_DIR}/unpack_resources"
 
 prepair_wine
-# Функция для распаковки файла
-unpack_file() {
-    local archive="$1"
-    7z x -y "$archive" -o"${UNPACK_RESOURCES}"
-}
-
-# Функция для установки .msi файлов
-install_msi_files() {
-    for msi_file in "${UNPACK_RESOURCES}"/*/*.msi; do
-        if [[ -f "$msi_file" ]]; then
-            echo "Установка $msi_file ..."
-            wine_run_install "$msi_file" /q
-        else
-            echo "Нет .msi файлов для установки в ${UNPACK_RESOURCES}/unpack_dop/*."
-        fi
-    done
-}
-
-# Функция для кодирования URL
-encode_url() {
-    local file_name="$1"
-    echo "${file_name// /%20}"  # Заменяем пробелы на %20
-}
 
 # Скачивание всех файлов
-download_all() {
+for file_name in "${FILES[@]}" ; do
-    for file_name in "${FILES[@]}"; do
-        local file_url="$(encode_url "$file_name")"
     local output="${WH_TMP_DIR}/${file_name// /_}"
 
-        echo "Скачивание $file_name..."
+    if try_download "$BASE_URL/$file_name" "$output" ; then
-        if try_download "$BASE_URL/$file_url" "$output"; then
+        unpack "$output" "$UNPACK_RESOURCES"
-            unpack_file "$output"
     fi
-    done
+    try_remove_file "$output"
-}
+done
 
-# Автоматически скачиваем и устанавливаем все файлы
+# Установка .msi файлов
-download_all
+for msi_file in "${UNPACK_RESOURCES}"/*/*.msi ; do
-install_msi_files
+    if [[ -f "$msi_file" ]] ; then
+        wine_run_install "$msi_file" /q
+    else
+        fatal "Нет .msi файлов для установки в ${UNPACK_RESOURCES}/unpack_dop/*."
+    fi
+done
 
-rm -f ${WH_TMP_DIR}/*.zip
 try_remove_dir "${UNPACK_RESOURCES}"

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
+# используем общий whdb файл для подготовки префикса и сервисов
-if [[ "$BASE_PFX" == "none" ]] \
+# prepair_wine используется из файла настроек
-|| ! systemctl list-units --type service --state running | grep aksusbd \
+source "$WH_DB_DIR/t-flex-cad17.whdb"
-|| ! 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
 
 # Программа 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

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"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
-# eucrtbase2019 baekmuk droid eufonts ipamona liberation lucida opensymbol sourcehansans tahoma takao uff unifont  vlgothic wenquanyi wenquanyizenhei
+export WINEARCH="win64"
+export WH_WINDOWS_VER="10"
+export WINEPREFIX="tflex17"
+export WH_XDG_OPEN="log"
 
-prepair_wine
+# используем общий whdb файл для подготовки префикса и сервисов
-
+# prepair_wine используется из файла настроек
-if [[ "$BASE_PFX" == "none" ]] \
+source "$WH_DB_DIR/t-flex-cad17.whdb"
-|| ! 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
 
 # Программа 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

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
+# используем общий whdb файл для подготовки префикса и сервисов
-if [[ "$BASE_PFX" == "none" ]] \
+# prepair_wine используется из файла настроек
-|| ! systemctl list-units --type service --state running | grep aksusbd \
+source "$WH_DB_DIR/t-flex-cad17.whdb"
-|| ! 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
 
 # Программа 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

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

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

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

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

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

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

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

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"

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"

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"

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"

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

winehelper

@@ -23,7 +23,7 @@ else
     for self_check_script in "$RUN_SCRIPT" \
     "$DATA_PATH/dependencies.sh" "$DATA_PATH/autoinstall"/* \
     "$DATA_PATH/manualinstall"/* "$DATA_PATH/database"/*
-    do /usr/bin/bash -n "$self_check_script" || exit 1
+    do /usr/bin/env bash -n "$self_check_script" || exit 1
     done
 fi
 
@@ -251,13 +251,12 @@ unpack () {
         print_ok "Файл $1 распакован."
         return 0
     else
-        print_error "Распаковать файл $1 не удалось!"
+        fatal "Распаковать файл $1 не удалось!"
-        return 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")"
 
@@ -949,6 +948,10 @@ init_wineprefix () {
 
     # хак для 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"
@@ -1176,7 +1179,7 @@ wine_run () {
 }
 
 wine_run_install () {
-    print_info "Запускаем установку приложения $PROG_NAME."
+    print_info "Запускаем установку: $1."
     if [[ "$INSTALL_MODE" == "manual" ]]
     then print_warning "Рекомендуется не менять пути для установки приложения!"
     fi