updated changelog to 0.4.4

CHANGELOG

@@ -1,7 +1,50 @@
 История изменений:
 
+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:
+* исправлено создание и восстановление резервных копий с разными именами пользователей
+
+0.4.1:
+* добавлена возможность создания резервной копии префикса:
+    winehelper backup-prefix [имя_префикса]
+* добавлена возможность восстановления резервной копии префикса:
+    winehelper restore-prefix "путь/до/резервной_копии.whpack"
+* создание и восстановление резервной копии префикса включает в себя требуемую версиею WINE и информацию для создания .desktop файлов (ярлыков), что дает возможность переноса префикса на ПК без доступа к интернету
+
+0.4.0:
+* добавлена автоматическая установка и настройка wine-cpcsp_proxy при
+использовании переменной WH_USE_CPCSP_PROXY=1
+* подготовка функций для создания бэкапов префикса
+
+0.3.9:
+* обновлен скрипт установки scadoffice
+* добавлена автоустановка:
+    winehelper easymnemo - "Easymnemo"
+* winetricks поставляется с пакетом WineHelper, а не скачивается из GitHub
+* добавлена возможность удаления префикса
+
 0.3.8:
-* добавлена возможность ассоциации и запуска файлов из WINE в нативном Linux приложении
+* добавлена возможность ассоциации и запуска файлов из WINE в нативном Linux
+приложении с помощью перемененной. Пример: WH_XDG_OPEN="rtf txt doc"
 * добавлен выбор префикса, если переменная WINEPREFIX не объявлена
 * добавлено сохранение последней конфигурации использования префикса
 * добавлено сохранение скписка создаваемых ярлыков для приложений

THIRD-PARTY

@@ -20,3 +20,6 @@ https://github.com/HansKristian-Work/vkd3d-proton
 
 WINETRICKS:
 https://github.com/Winetricks/winetricks
+
+WINE-CPCSP_PROXY:
+https://github.com/Etersoft/wine-cpcsp_proxy

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

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+# info_ru: Удобная программа для создания двухмерных схем и чертежей. Основной акцент сделан на проектировании систем тепло-, водо- и газоснабжения, водоочистки, автоматизированных систем управления технологическими процессами (АСУТП), а также планов эвакуации при пожаре и авариях.
+########################################################################
+export WH_WINE_USE="wine_x_tkg_10-0_i586"
+export WINEPREFIX="easymnemo"
+export PROG_NAME="Easymnemo"
+export PROG_ICON="easymnemo"
+export BASE_PFX="none"
+export WH_WINDOWS_VER="10"
+export WINEARCH="win32"
+export INSTALL_DLL="dotnet35 mdac28 jet40"
+
+AUTOINSTALL_EXE="${WH_TMP_DIR}/Easymnemo.zip"
+AUTOINSTALL_UNPACK="${WH_TMP_DIR}/Easymnemo"
+AUTOINSTALL_SETUP="${WH_TMP_DIR}/Easymnemo/EasyMnemo.msi"
+
+prepair_wine
+if try_download "https://s.siteapi.org/c6e311629e736a8.ru/docs/j3pdl4vxv5wkg0sg0ksks40k8ss0sc" "${AUTOINSTALL_EXE}" ; then
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
+    try_remove_file "$AUTOINSTALL_EXE"
+
+    wine_run_install "${AUTOINSTALL_SETUP}" /q
+    try_remove_dir "$AUTOINSTALL_UNPACK"
+
+    WIN_FILE_EXEC="$DRIVE_C/Program Files/Easymnemo/Easymnemo.exe"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+fi

autoinstall/scadoffice

@@ -3,13 +3,16 @@
 ########################################################################
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="scadoffice"
-export BASE_PFX="scadaoffice_pfx_x64_v01"
+export BASE_PFX="scadaoffice_pfx_x64_v03"
 export WH_WINDOWS_VER="10"
 export WINEARCH="win64"
-export INSTALL_DLL="dotnet48 gdiplus vcrun6sp6 vcrun2005 vcrun2019 d3dx11_42 d3dx11_43 d3dx9 d3dcompiler_42 d3dcompiler_43 d3dcompiler_46 d3dcompiler_47 richtx32 riched30 riched20 msxml6 dotnet20"
+export INSTALL_DLL="dotnet20 dotnet472 dotnet48 gdiplus vcrun6sp6 vcrun2005 vcrun2019 d3dx11_42 d3dx11_43 d3dx9 d3dcompiler_42 d3dcompiler_43 d3dcompiler_46 d3dcompiler_47 richtx32 riched30 riched20 msxml6"
+export WH_XDG_OPEN="rtf"
 AUTOINSTALL_EXE="${WH_TMP_DIR}/SCADOffice_installer.exe"
+SCADOFFICE_ADDONS_URL="https://cloud.linux-gaming.ru/portproton/scadoffice_addons_v02.tar.xz"
 
 prepair_wine
+
 DRIVE_C_SCADOFFICE="$DRIVE_C/SCAD Soft/SCADOffice/64"
 
 if [[ -n $2 ]] ; then
@@ -29,21 +32,16 @@ fi
 if [[ $BASE_PFX == "none" ]] ; then
     print_info "Установка дополнительных компонентов..."
 
-    ADDONS_PACK="${WH_TMP_DIR}/scadoffice_addons_v01.tar.xz"
+    ADDONS_PACK="${WH_TMP_DIR}/$(basename "$SCADOFFICE_ADDONS_URL")"
     ADDONS_PATH="${WH_TMP_DIR}/scadoffice_addons"
-    OFFICE_EXE="${ADDONS_PATH}/OpenOffice.exe"
-    OFFICE_PACK="${ADDONS_PATH}/OpenOffice"
-    AUTOINSTALL_SETUP="${ADDONS_PATH}/OpenOffice/setup.exe"
+
     ADDONS_PATH_REG="${ADDONS_PATH}/REG"
     ADDONS_PATH_MDAC="${ADDONS_PATH}/mdac64"
     ADDONS_PATH_OPENSSH="${ADDONS_PATH}/OpenSSH"
 
-    if try_download "https://cloud.linux-gaming.ru/portproton/scadoffice_addons_v01.tar.xz" "${ADDONS_PACK}" ; then
+    if try_download "$SCADOFFICE_ADDONS_URL" "${ADDONS_PACK}" ; then
         create_new_dir "${ADDONS_PATH}"
         unpack "${ADDONS_PACK}" "${ADDONS_PATH}"
-        7z x -y "${OFFICE_EXE}" -o"${OFFICE_PACK}"
-        wine_run_install "${AUTOINSTALL_SETUP}" /qn
-
         wine_run regedit "${ADDONS_PATH_REG}"/*.reg
 
         # Установка ODBC
@@ -73,12 +71,8 @@ if try_download "https://scadhelp.ru/files/10/download" "${AUTOINSTALL_EXE}" ; t
 
     declare -a WIN_FILE_EXEC=("${DRIVE_C_SCADOFFICE}/Arbat.exe" "${DRIVE_C_SCADOFFICE}/West.exe" "${DRIVE_C_SCADOFFICE}/GlobalSettings.exe" "${DRIVE_C_SCADOFFICE}/Decor.exe" "${DRIVE_C_SCADOFFICE}/ReBar.exe" "${DRIVE_C_SCADOFFICE}/UnderGround.exe" "${DRIVE_C_SCADOFFICE}/ComeIn.exe" "${DRIVE_C_SCADOFFICE}/CoCon.exe" "${DRIVE_C_SCADOFFICE}/Comet2.exe" "${DRIVE_C_SCADOFFICE}/Section.exe" "${DRIVE_C_SCADOFFICE}/Consul.exe" "${DRIVE_C_SCADOFFICE}/ConfigProtection.exe" "${DRIVE_C_SCADOFFICE}/Kristall.exe" "${DRIVE_C_SCADOFFICE}/Cross.exe" "${DRIVE_C_SCADOFFICE}/Kust2.exe" "${DRIVE_C_SCADOFFICE}/Magnum.exe" "${DRIVE_C_SCADOFFICE}/Monolit.exe" "${DRIVE_C_SCADOFFICE}/Slope.exe" "${DRIVE_C_SCADOFFICE}/Pasternak.exe" "${DRIVE_C_SCADOFFICE}/UCalc.exe" "${DRIVE_C_SCADOFFICE}/ViewProf.exe" "${DRIVE_C_SCADOFFICE}/SCalc.exe" "${DRIVE_C_SCADOFFICE}/AccelEdit.exe" "${DRIVE_C_SCADOFFICE}/BetaEdit.exe" "${DRIVE_C_SCADOFFICE}/MaterialsEdit.exe" "${DRIVE_C_SCADOFFICE}/Tonus.exe" "${DRIVE_C_SCADOFFICE}/Sezam.exe" "${DRIVE_C_SCADOFFICE}/SCADX.exe")
 
-    # Цикл создания десктоп файлов для scad office в каталог SCADOFFICE на рабочемм столе
+    # Цикл создания десктоп файлов для scad office
     for i in "${!PROG_NAME[@]}"; do
         create_desktop "${PROG_NAME[i]}" "${WIN_FILE_EXEC[i]}" "${PROG_ICON[i]}" "nocopy"
     done
-
-    # Cоздание десктоп файла для openoffice
-    WIN_FILE_EXEC1="$DRIVE_C/Program Files (x86)/OpenOffice 4/program/soffice.exe"
-    create_desktop "OpenOffice" "$WIN_FILE_EXEC1" "openoffice" "nocopy"
 fi

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
-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

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

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}"

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}"

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

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

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

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

dependencies.sh

@@ -19,11 +19,11 @@ apt-repo | grep -q "x86_64-i586" || fatal "Репозиторий x86_64-i586 н
 windows приложения. Подробнее по ссылке: https://www.altlinux.org/Biarch"
 
 ##### INSTALL DEPENDENCIES #####
+# fonts-ttf-ms
+
 apt-get install {i586-,}{glibc-core,libstdc++6,glibc-pthread,glibc-nss,\
 libOSMesa,libnss-mdns,libunixODBC2,ocl-icd,libfreetype,libfontconfig1,\
 libgnutls30,libGL,libEGL,xorg-dri-swrast,xorg-dri-intel,xorg-dri-radeon,\
-libvulkan1,libcups} winetricks ca-certificates cups-pdf  || fatal "Не удалось установить зависимости."
+libvulkan1,libcups} || fatal "Не удалось установить зависимости."
 
 apt-get install {i586-,}wine
-
-# yad zenity

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

sha256sum.list

@@ -3,6 +3,7 @@
 3571c40a787f0386e0160b5d471b1bf11fa2a235b497156cd38198b90bcb4a9f  wine_x_tkg_10-0_i586.tar.xz
 71d6fdfd23d7988471d345c68e81699b8af931352b03dd216424b398f63c7b12  wine_x_tkg_10-0_amd64.tar.xz
 fb7fdfde96de10a1b3b051bdf2727b6a7c1768b878483726454dd6726e9e0193  wine-9.0.14-alt1-i586-spravkibk.tar.xz
+e0a84bb4908c3927954d7eef6b8ac7212e442b8c107d000c6890fec340f96183  wine-9.0.14-alt1-amd64.tar.xz
 6f86d2220b65b709bf88c6f829a4998de3b929cc2091cd1333a51c32e1491b79  wine-9.0.9-alt1-i586.tar.xz
 
 ##### DXVK #####
@@ -13,6 +14,9 @@ fb7fdfde96de10a1b3b051bdf2727b6a7c1768b878483726454dd6726e9e0193  wine-9.0.14-al
 
 df1a940d2e072a884524f66a16e0f0ef74048bc6a6642b96eb257528a522109f  vkd3d-proton-1.1-2602.tar.xz
 
+##### CPCSP_PROXY #####
+3153088ff28d6af415c3504a421e5382554dbb305f38d5a87dd84df90d680421  wine-cpcsp_proxy-0.6.1-alt1.tar.xz
+
 ##### PREFIX #####
 
 0e86cd9958d1bd1bfac99e23165a091a4ea2fa3e693c551f69aabeed5f681fea  defpfx_x86_v01.tar.xz
@@ -64,7 +68,8 @@ dfb44ce5e5af7dba1686932c63d6b05e5dd6919a21c78130a7d1d0271b93958e  audiorecstatio
 # create with wine_x_tkg_10-0_i586 (universal user: xuser)
 # winetricks arial dotnet7 dotnetdesktop7 renderer=gdi
 
-daaaef625f8f44688faf12f9ef4360ad1d35b377b23be634b45c1b8d43239686  scadaoffice_pfx_x64_v01.tar.xz
+25e277c7afa4a9afc5f013cb05f872c12a7f381c4f0503a423dcacccca9a14c6  scadaoffice_pfx_x64_v03.tar.xz
 # create with wine_x_tkg_10-0_i586 (universal user: xuser)
 # winetricks dotnet48 gdiplus vcrun6sp6 vcrun2005 vcrun2019 d3dx11_42 d3dx11_43 d3dx9 d3dcompiler_42 d3dcompiler_43 d3dcompiler_46 d3dcompiler_47 richtx32 riched30 riched20 msxml6 dotnet20
-# + addons with openoffice, ODBC, SSH, *.reg
+# + addons with ODBC, SSH, *.reg
+0f4ef434df07bc338ae308af44330590eaa1d9c94b64850514e55b960642d0eb  scadoffice_addons_v02.tar.xz