fixed typos

CHANGELOG

@@ -1,5 +1,58 @@
 История изменений:
 
+0.4.9:
+* добавлено автодопонение команд для zsh (zsh_completion)
+
+0.4.8:
+* все скрипты для программ daobit-* переведены из ручных установок в автоматические
+
+0.4.7:
+* обновлены скрипты установки и префикс для программ ved-* и ctm-*
+* обновлены скрипты установки для программ daobit-*
+* улучшено отображение шрифтов в ПО: Справки БК
+* добавлена проверка хэш-суммы для сохраненных архивов
+
+0.4.6:
+* добавлено автодопонение команд для bash (bash_completion)
+
+0.4.5:
+* скорректирована проверка синтаксиса скриптов
+
+0.4.4:
+* добавлены/обновлены скрипты установки:
+    winehelper install t-flex-cad17 - "T-FLEX CAD 17"
+    winehelper install t-flex-doc17 - "T-FLEX DOCs 17"
+    winehelper install t-flex-cad2d+17 - "T-FLEX CAD 2D+ 17"
+    winehelper install t-flex-cad-edu17 - "T-FLEX CAD Учебная Версия 17"
+    winehelper install t-flex-viewer17 - "T-FLEX Viewer 17"
+
+    winehelper install t-flex-cad17-applications
+    Приложения для T-FLEX CAD 17 (T-FLEX Анализ 17, T-FLEX Динамика 17, T-FLEX Зубчатые передачи 17, T-FLEX ЧПУ 17, T-FLEX Раскрой 17, T-FLEX Электротехника 17, T-FLEX VR 17, T-FLEX Печатные платы 17)
+
+    winehelper install t-flex-cad17-resources
+    Обучающие материалы, примеры, бесплатные библиотеки для T-FLEX CAD 17 (Учебное пособие 17, Стандартные элементы 17, Элементы уплотнительной техники 17, Станочные приспособления 17, Детали штампов листовой штамповки 17, Детали пресс-форм 17, Примеры 17)
+
+* добавлена ручная установка дополнений для T-FLEX CAD 17:
+    winehelper install t-flex-cad17-manual "/путь/до/файла"
+
+0.4.3:
+* исправлено обновление префикса при первом запуске
+
+0.4.2:
+* исправлено создание и восстановление резервных копий с разными именами пользователей
+
+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
 * добавлена автоустановка:
@@ -8,7 +61,8 @@
 * добавлена возможность удаления префикса
 
 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

auto_completion/bash_completion/winehelper

@@ -0,0 +1,42 @@
+# Auto-completion for winehelper
+_winehelper_completions() {
+    local cur prev opts
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+    opts="--help --version --debug install installed -r -i remove-all --clear-pfx killall remove-prefix backup-prefix restore-prefix"
+    wine_cmd="winecfg winereg winefile wineconsole winetricks desktop regedit explorer cmd run"
+
+    case "${prev}" in
+        winehelper)
+            COMPREPLY=( $(compgen -W "${opts} ${wine_cmd}" -- "${cur}") )
+            return 0
+            ;;
+        --debug)
+            COMPREPLY=( $(compgen -W "${wine_cmd}" -- "${cur}") )
+            return 0
+            ;;
+        install|-i)
+            local scripts="$(ls -1 /usr/share/winehelper/autoinstall) $(ls -1 /usr/share/winehelper/manualinstall)"
+            COMPREPLY=( $(compgen -W "list ${scripts}" -- "${cur}") )
+            return 0
+            ;;
+        run|installed)
+            local installed=$(ls -1 ~/.local/share/winehelper/ | grep ".desktop" | sed 's/.desktop//')
+            COMPREPLY=( $(compgen -W "${installed}" -- "${cur}") )
+            return 0
+            ;;
+        remove-prefix|backup-prefix)
+            local prefixes=$(ls -1 ~/.local/share/winehelper/prefixes 2>/dev/null)
+            COMPREPLY=( $(compgen -W "${prefixes}" -- "${cur}") )
+            return 0
+            ;;
+        restore-prefix)
+            return 0
+            ;;
+        *)
+            ;;
+    esac
+}
+
+complete -F _winehelper_completions winehelper

auto_completion/zsh_completion/_winehelper

@@ -0,0 +1,112 @@
+#compdef winehelper
+# shellcheck disable=SC2034,SC2206
+_winehelper() {
+  local -a opts wine_cmd scripts installed prefixes
+
+  opts=(
+    '--help[Вывести справку]'
+    '--version[Показать информацию о пакете и его версии]'
+    '--debug[Режим отладки]'
+    'install[Запустить скрипт установки программы]'
+    'installed[Список установленных программ]'
+    '-r[Запуск программы (отладка)]'
+    '-i[Запустить скрипт установки программы]'
+    'remove-all[Удалить WineHelper и все связанные данные]'
+    '--clear-pfx[Очистить префикс \[имя_префикса\]]'
+    'killall[Убить все процессы]'
+    'remove-prefix[Удалить префикс и все связанные данные]'
+    'backup-prefix[Создать резерную копию префикса]'
+    'restore-prefix[восстановить префикс из резервной копии "путь/до/whpack"]'
+  )
+
+  wine_cmd=(
+    winecfg
+    winereg
+    winefile
+    wineconsole
+    winetricks
+    desktop
+    regedit
+    explorer
+    cmd
+    'run[Запуск программы (отладка)]'
+  )
+
+  local context state line
+  _arguments -C \
+    '1:command:->cmds' \
+    '2:subcommand or argument:->args'
+
+  case $state in
+    cmds)
+      _values 'winehelper options' "${opts[@]}" "${wine_cmd[@]}"
+      ;;
+    args)
+      case $words[2] in
+        --debug)
+          _values 'wine commands' "${wine_cmd[@]}"
+          ;;
+        install|-i)
+          _get_list_for_install
+          ;;
+        run|installed)
+          _get_installed_list
+          ;;
+        remove-prefix|backup-prefix)
+          _get_prefixes
+          ;;
+        restore-prefix)
+          _files
+          ;;
+        *)
+          _values 'winehelper options' "${opts[@]}" "${wine_cmd[@]}"
+          ;;
+      esac
+      ;;
+  esac
+}
+
+_get_prefixes () {
+  prefixes=( ${(f)"$(ls -1 ~/.local/share/winehelper/prefixes 2>/dev/null)"} )
+
+  if ((! ${#prefixes[@]} == 0 )); then
+    _values 'prefixes' "${prefixes[@]}"
+  fi
+}
+
+_get_list_for_install () {
+  
+  packages=(${(f)"$(winehelper install list 2>/dev/null |
+    awk -F ' - ' '
+      /^[^ ]+ - \("/ {next}
+      /^[[:space:]]*$/ {next}
+      /^Информация:/ {next}
+      /^[^ ]+ - / {
+        name=$1;
+        desc=$2;
+        gsub(/^[[:space:]]+|[[:space:]]+$/, "", name);
+        gsub(/^[[:space:]]*"?|"?[[:space:]]*$/, "", desc);
+        if (name && desc) print name ":" desc
+      }
+    ')"})
+  
+  packages+=(
+    scadoffice:"SCAD Office"
+    t-flex-cad17-applications:"Приложения для T-FLEX CAD 17"
+    t-flex-cad17-resources:"Обучающие материалы T-FLEX CAD 17"
+  )
+
+    _describe 'packages' packages
+}
+
+_get_installed_list () {
+  installed=(
+    ${(f)"$(ls -1 ~/.local/share/winehelper/ | grep ".desktop" | sed 's/.desktop//')"}
+  )
+
+  if ((! ${#installed[@]} == 0 )); then
+    _values 'installed apps' "${installed[@]}"
+  fi
+}
+
+compdef _winehelper winehelper

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

@@ -6,19 +6,22 @@ export PROG_ICON="ctmfinance"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="ved_ctm"
-export BASE_PFX="ved_ctm_pfx_x86_v04"
+export BASE_PFX="ved_ctm_pfx_x86_v05"
 export WINEARCH="win32"
 export WH_WINDOWS_VER="7"
-export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8"
+export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8 vcrun2019 dotnet7 dotnetdesktop7 renderer=gdi"
 
 prepair_wine
 
+# фикс постоянного запроса обновления Windows
+get_and_set_reg_file --add 'Software\CTM\CTMSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
 AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_fn.exe"
 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

@@ -6,19 +6,22 @@ export PROG_ICON="ctmjournals"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="ved_ctm"
-export BASE_PFX="ved_ctm_pfx_x86_v04"
+export BASE_PFX="ved_ctm_pfx_x86_v05"
 export WINEARCH="win32"
 export WH_WINDOWS_VER="7"
-export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8"
+export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8 vcrun2019 dotnet7 dotnetdesktop7 renderer=gdi"
 
 prepair_wine
 
+# фикс постоянного запроса обновления Windows
+get_and_set_reg_file --add 'Software\CTM\CTMSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
 AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_jr.exe"
 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

@@ -6,19 +6,22 @@ export PROG_ICON="ctmmonitor"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="ved_ctm"
-export BASE_PFX="ved_ctm_pfx_x86_v04"
+export BASE_PFX="ved_ctm_pfx_x86_v05"
 export WINEARCH="win32"
 export WH_WINDOWS_VER="7"
-export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8"
+export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8 vcrun2019 dotnet7 dotnetdesktop7 renderer=gdi"
 
 prepair_wine
 
+# фикс постоянного запроса обновления Windows
+get_and_set_reg_file --add 'Software\CTM\CTMSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
 AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_me.exe"
 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

@@ -6,19 +6,22 @@ export PROG_ICON="ctmreport"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="ved_ctm"
-export BASE_PFX="ved_ctm_pfx_x86_v04"
+export BASE_PFX="ved_ctm_pfx_x86_v05"
 export WINEARCH="win32"
 export WH_WINDOWS_VER="7"
-export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8"
+export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8 vcrun2019 dotnet7 dotnetdesktop7 renderer=gdi"
 
 prepair_wine
 
+# фикс постоянного запроса обновления Windows
+get_and_set_reg_file --add 'Software\CTM\CTMSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
 AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_rp.exe"
 AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_rp"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_rp/setup.exe"
 
 if try_download "https://ftp.ctm.ru/REPORT/SFX/setup_rp.exe" "${AUTOINSTALL_EXE}" ; then
-    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    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

@@ -6,19 +6,22 @@ export PROG_ICON="ctmservice"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="ved_ctm"
-export BASE_PFX="ved_ctm_pfx_x86_v04"
+export BASE_PFX="ved_ctm_pfx_x86_v05"
 export WINEARCH="win32"
 export WH_WINDOWS_VER="7"
-export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8"
+export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8 vcrun2019 dotnet7 dotnetdesktop7 renderer=gdi"
 
 prepair_wine
 
+# фикс постоянного запроса обновления Windows
+get_and_set_reg_file --add 'Software\CTM\CTMSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
 AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_cs.exe"
 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/daobit-cservice

@@ -9,20 +9,22 @@ export BASE_PFX="daobit_pfx_x86_v01"
 export WH_WINDOWS_VER="10"
 export WINEARCH="win32"
 export INSTALL_DLL="dotnet7 dotnetdesktop7 arial renderer=gdi"
+
+AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_cs.exe"
 AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_cs"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_cs/SETUP.EXE"
-EXE_SETUP_NAME="setup_cs.exe"
 
-if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then
+prepair_wine
-    prepair_wine
+if try_download "https://files.daobit.ru/CSERVICE/SFX/setup_cs.exe" "${AUTOINSTALL_EXE}" ; then
 
-    7z x -y "$2" -o"${AUTOINSTALL_UNPACK}"
+    # фикс постоянного запроса обновления Windows
+    get_and_set_reg_file --add 'Software\DAO\DAOSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
+    unpack "${AUTOINSTALL_EXE}" "${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"
     create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
     try_remove_dir "$AUTOINSTALL_UNPACK"
-else
+    try_remove_file "$AUTOINSTALL_EXE"
-    fatal "Не найден файл установки для $PROG_NAME. Перезапустите по примеру:
-    winehelper install $1 \"/путь/до/$EXE_SETUP_NAME\""
 fi

autoinstall/daobit-ratlas

@@ -9,20 +9,22 @@ export BASE_PFX="daobit_pfx_x86_v01"
 export WH_WINDOWS_VER="10"
 export WINEARCH="win32"
 export INSTALL_DLL="dotnet7 dotnetdesktop7 arial renderer=gdi"
+
+AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_rk.exe"
 AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_rk"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_rk/setup.exe"
-EXE_SETUP_NAME="setup_rk.exe"
 
-if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then
+prepair_wine
-    prepair_wine
+if try_download "https://files.daobit.ru/RATLAS/SFX/setup_rk.exe" "${AUTOINSTALL_EXE}" ; then
 
-    7z x -y "$2" -o"${AUTOINSTALL_UNPACK}"
+    # фикс постоянного запроса обновления Windows
+    get_and_set_reg_file --add 'Software\DAO\DAOSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
+    unpack "${AUTOINSTALL_EXE}" "${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"
     create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
     try_remove_dir "$AUTOINSTALL_UNPACK"
-else
+    try_remove_file "$AUTOINSTALL_EXE"
-    fatal "Не найден файл установки для $PROG_NAME. Перезапустите по примеру:
-    winehelper install $1 \"/путь/до/$EXE_SETUP_NAME\""
 fi

autoinstall/daobit-rinfo

@@ -9,20 +9,22 @@ export BASE_PFX="daobit_pfx_x86_v01"
 export WH_WINDOWS_VER="10"
 export WINEARCH="win32"
 export INSTALL_DLL="dotnet7 dotnetdesktop7 arial renderer=gdi"
+
+AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_ri.exe"
 AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_ri"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_ri/setup.exe"
-EXE_SETUP_NAME="setup_ri.exe"
 
-if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then
+prepair_wine
-    prepair_wine
+if try_download "https://files.daobit.ru/RINFO/SFX/setup_ri.exe" "${AUTOINSTALL_EXE}" ; then
 
-    7z x -y "$2" -o"${AUTOINSTALL_UNPACK}"
+    # фикс постоянного запроса обновления Windows
+    get_and_set_reg_file --add 'Software\DAO\DAOSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
+    unpack "${AUTOINSTALL_EXE}" "${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"
     create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
     try_remove_dir "$AUTOINSTALL_UNPACK"
-else
+    try_remove_file "$AUTOINSTALL_EXE"
-    fatal "Не найден файл установки для $PROG_NAME. Перезапустите по примеру:
-    winehelper install $1 \"/путь/до/$EXE_SETUP_NAME\""
 fi

autoinstall/daobit-rtariff

@@ -9,20 +9,22 @@ export BASE_PFX="daobit_pfx_x86_v01"
 export WH_WINDOWS_VER="10"
 export WINEARCH="win32"
 export INSTALL_DLL="dotnet7 dotnetdesktop7 arial renderer=gdi"
+
+AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_rt.exe"
 AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_rt"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_rt/setup.exe"
-EXE_SETUP_NAME="setup_rt.exe"
 
-if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then
+prepair_wine
-    prepair_wine
+if try_download "https://files.daobit.ru/RTARIFF/SFX/setup_rt.exe" "${AUTOINSTALL_EXE}" ; then
 
-    7z x -y "$2" -o"${AUTOINSTALL_UNPACK}"
+    # фикс постоянного запроса обновления Windows
+    get_and_set_reg_file --add 'Software\DAO\DAOSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
+    unpack "${AUTOINSTALL_EXE}" "${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"
     create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
     try_remove_dir "$AUTOINSTALL_UNPACK"
-else
+    try_remove_file "$AUTOINSTALL_EXE"
-    fatal "Не найден файл установки для $PROG_NAME. Перезапустите по примеру:
-    winehelper install $1 \"/путь/до/$EXE_SETUP_NAME\""
 fi

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

@@ -9,6 +9,7 @@ export BASE_PFX="spravkibk_pfx_x86_v03"
 export WH_WINDOWS_VER="10"
 export WINEARCH="win32"
 export INSTALL_DLL="msxml3 msxml6 dotnet35sp1 renderer=gdi"
+export WH_USE_EXTRA_FONTS="1"
 
 AUTOINSTALL_EXE="${WH_TMP_DIR}/СПО-Справки-БК-(версия-2.5.5)-от-31.01.2024.zip"
 AUTOINSTALL_UNPACK="${WH_TMP_DIR}/SpravkiBk"
@@ -16,7 +17,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,18 @@
 # 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_wh_tflex_10-9_amd64"
+export BASE_PFX="tflex17_pfx_x64_v02"
+export WINEARCH="win64"
+export WH_WINDOWS_VER="10"
+export WINEPREFIX="tflex17"
+export WH_XDG_OPEN="log"
+export WH_USE_MESA_GL_OVERRIDE="1"
 
-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 +23,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
@@ -92,5 +35,5 @@ if try_download "https://www.tflexcad.ru/download/t-flex-cad-free/files/TFCAD_ST
     try_remove_dir "${WH_TMP_DIR}/Стандартные элементы 17"
 
     WIN_FILE_EXEC="$DRIVE_C/Program Files/T-FLEX CAD Учебная Версия 17/Program/TFlexCad.exe"
-    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON" "TFlexCadEDU"
 fi

autoinstall/t-flex-cad17

@@ -2,75 +2,18 @@
 # 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_wh_tflex_10-9_amd64"
+export BASE_PFX="tflex17_pfx_x64_v02"
+export WINEARCH="win64"
+export WH_WINDOWS_VER="10"
+export WINEPREFIX="tflex17"
+export WH_XDG_OPEN="log"
+export WH_USE_MESA_GL_OVERRIDE="1"
 
-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,12 +21,12 @@ 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
     try_remove_file "${AUTOINSTALL_EXE}"
 
     WIN_FILE_EXEC="$DRIVE_C/Program Files/T-FLEX CAD 17/Program/TFlexCad.exe"
-    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON" "TFlexCad"
 fi

autoinstall/t-flex-cad17-applications

@@ -0,0 +1,51 @@
+#!/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_wh_tflex_10-9_amd64"
+export BASE_PFX="tflex17_pfx_x64_v02"
+export WINEARCH="win64"
+export WINEPREFIX="tflex17"
+export WH_XDG_OPEN="log"
+export WH_USE_MESA_GL_OVERRIDE="1"
+
+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,50 @@
+#!/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_wh_tflex_10-9_amd64"
+export BASE_PFX="tflex17_pfx_x64_v02"
+export WINEARCH="win64"
+export WINEPREFIX="tflex17"
+export WH_XDG_OPEN="log"
+export WH_USE_MESA_GL_OVERRIDE="1"
+
+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,18 @@
 # 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_wh_tflex_10-9_amd64"
+export BASE_PFX="tflex17_pfx_x64_v02"
+export WINEARCH="win64"
+export WH_WINDOWS_VER="10"
+export WINEPREFIX="tflex17"
+export WH_XDG_OPEN="log"
+export WH_USE_MESA_GL_OVERRIDE="1"
 
-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,12 +21,12 @@ 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
     try_remove_file "${AUTOINSTALL_EXE}"
 
     WIN_FILE_EXEC="$DRIVE_C/Program Files/T-FLEX CAD 2D+ 17/Program/TFlexCad.exe"
-    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON" "TFlexCad2D"
 fi

autoinstall/t-flex-doc17

@@ -1,91 +0,0 @@
-#!/usr/bin/env bash
-# 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
-
-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
-
-# Программа T-FLEX DOC
-AUTOINSTALL_ZIP="${WH_TMP_DIR}/T-FLEX DOCs 17 Client.zip"
-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}"
-    try_remove_file "${AUTOINSTALL_ZIP}"
-
-    wine_run_install "${AUTOINSTALL_EXE}" /q
-    try_remove_file "${AUTOINSTALL_EXE}"
-
-    WIN_FILE_EXEC="$DRIVE_C/Program Files (x86)/T-FLEX DOCs 17/Program/TFlex.DOCs.Client.exe"
-    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
-fi

autoinstall/t-flex-docs17

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+# info_ru: Система T-FLEX DOCs предназначена для комплексного управления инженерными данными предприятия, а также решения задач конструкторско-технологического и организационно-распорядительного документооборота.
+########################################################################
+export PROG_NAME="T-FLEX DOCs 17"
+export PROG_ICON="tflexdoc"
+export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
+export BASE_PFX="tflex17_pfx_x64_v02"
+export WINEARCH="win64"
+export WH_WINDOWS_VER="10"
+export WINEPREFIX="tflex17"
+export WH_XDG_OPEN="log"
+export WH_USE_MESA_GL_OVERRIDE="1"
+
+# используем общий 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"
+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
+    unpack "${AUTOINSTALL_ZIP}" "${AUTOINSTALL_DIR}"
+    try_remove_file "${AUTOINSTALL_ZIP}"
+
+    wine_run_install "${AUTOINSTALL_EXE}" /q
+    try_remove_file "${AUTOINSTALL_EXE}"
+
+    WIN_FILE_EXEC="$DRIVE_C/Program Files (x86)/T-FLEX DOCs 17/Program/TFlex.DOCs.Client.exe"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+fi

autoinstall/t-flex-viewer17

@@ -2,75 +2,18 @@
 # 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_wh_tflex_10-9_amd64"
+export BASE_PFX="tflex17_pfx_x64_v02"
+export WINEARCH="win64"
+export WH_WINDOWS_VER="10"
+export WINEPREFIX="tflex17"
+export WH_XDG_OPEN="log"
+export WH_USE_MESA_GL_OVERRIDE="1"
 
-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 +21,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

@@ -6,19 +6,22 @@ export PROG_ICON="vedalf"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="ved_ctm"
-export BASE_PFX="ved_ctm_pfx_x86_v04"
+export BASE_PFX="ved_ctm_pfx_x86_v05"
 export WINEARCH="win32"
 export WH_WINDOWS_VER="7"
-export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8"
+export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8 vcrun2019 dotnet7 dotnetdesktop7 renderer=gdi"
 
 prepair_wine
 
+# фикс постоянного запроса обновления Windows
+get_and_set_reg_file --add 'Software\CTM\CTMSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
 AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_al.exe"
 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

@@ -6,19 +6,22 @@ export PROG_ICON="vedcontrol"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="ved_ctm"
-export BASE_PFX="ved_ctm_pfx_x86_v04"
+export BASE_PFX="ved_ctm_pfx_x86_v05"
 export WINEARCH="win32"
 export WH_WINDOWS_VER="7"
-export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8"
+export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8 vcrun2019 dotnet7 dotnetdesktop7 renderer=gdi"
 
 prepair_wine
 
+# фикс постоянного запроса обновления Windows
+get_and_set_reg_file --add 'Software\CTM\CTMSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
 AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_cl.exe"
 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

@@ -6,19 +6,22 @@ export PROG_ICON="veddcl"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="ved_ctm"
-export BASE_PFX="ved_ctm_pfx_x86_v04"
+export BASE_PFX="ved_ctm_pfx_x86_v05"
 export WINEARCH="win32"
 export WH_WINDOWS_VER="7"
-export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8"
+export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8 vcrun2019 dotnet7 dotnetdesktop7 renderer=gdi"
 
 prepair_wine
 
+# фикс постоянного запроса обновления Windows
+get_and_set_reg_file --add 'Software\CTM\CTMSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
 AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_dl.exe"
 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

@@ -6,19 +6,22 @@ export PROG_ICON="vedinfo"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="ved_ctm"
-export BASE_PFX="ved_ctm_pfx_x86_v04"
+export BASE_PFX="ved_ctm_pfx_x86_v05"
 export WINEARCH="win32"
 export WH_WINDOWS_VER="7"
-export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8"
+export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8 vcrun2019 dotnet7 dotnetdesktop7 renderer=gdi"
 
 prepair_wine
 
+# фикс постоянного запроса обновления Windows
+get_and_set_reg_file --add 'Software\CTM\CTMSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
 AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_vi.exe"
 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

@@ -6,19 +6,22 @@ export PROG_ICON="vedpayments"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="ved_ctm"
-export BASE_PFX="ved_ctm_pfx_x86_v04"
+export BASE_PFX="ved_ctm_pfx_x86_v05"
 export WINEARCH="win32"
 export WH_WINDOWS_VER="7"
-export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8"
+export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8 vcrun2019 dotnet7 dotnetdesktop7 renderer=gdi"
 
 prepair_wine
 
+# фикс постоянного запроса обновления Windows
+get_and_set_reg_file --add 'Software\CTM\CTMSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
 AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_pa.exe"
 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

@@ -6,19 +6,22 @@ export PROG_ICON="vedsts"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="ved_ctm"
-export BASE_PFX="ved_ctm_pfx_x86_v04"
+export BASE_PFX="ved_ctm_pfx_x86_v05"
 export WINEARCH="win32"
 export WH_WINDOWS_VER="7"
-export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8"
+export INSTALL_DLL="vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8 vcrun2019 dotnet7 dotnetdesktop7 renderer=gdi"
 
 prepair_wine
 
+# фикс постоянного запроса обновления Windows
+get_and_set_reg_file --add 'Software\CTM\CTMSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
+
 AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_st.exe"
 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,98 @@
+#!/usr/bin/env bash
+# info_ru: Компоненты сервисов поддержки T-FLEX 17
+########################################################################
+export WH_WINDOWS_VER="10"
+export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
+export BASE_PFX="tflex17_pfx_x64_v02"
+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"
+export WH_USE_MESA_GL_OVERRIDE="1"
+
+# Компоненты поддержки 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_REG_LIN="$AUTOINSTALL_DIR_LIN/Components/fake_hasp.reg"
+
+# Компоненты поддержки T-FLEX PLM 17 (Windows)
+AUTOINSTALL_ZIP_WIN="$WH_TMP_DIR/T-FLEX 17 Prerequisites.zip"
+AUTOINSTALL_DIR_WIN="$WH_TMP_DIR/Компоненты поддержки T-FLEX 17"
+AUTOINSTALL_EXE_WIN1="$AUTOINSTALL_DIR_WIN/Access Database Engine 2007/AccessDatabaseEngine.exe"
+AUTOINSTALL_EXE_WIN_MSI="$AUTOINSTALL_DIR_WIN/Access Database Engine 2007"
+AUTOINSTALL_EXE_WIN2="$AUTOINSTALL_DIR_WIN/TSC2/Setup_TSC2.msi"
+
+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)
+        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"
+            "$WINELOADER" regedit "$AUTOINSTALL_REG_LIN"
+        fi
+
+        if [[ "$BASE_PFX" == "none" ]] ; then
+            # Компоненты поддержки T-FLEX PLM 17 (Windows)
+            if try_download "https://www.tflex.ru/downloads/T-FLEX%2017%20Prerequisites.zip" "${AUTOINSTALL_ZIP_WIN}" ; then
+                unpack "$AUTOINSTALL_ZIP_WIN" "$WH_TMP_DIR"
+                unpack "$AUTOINSTALL_EXE_WIN1" "$AUTOINSTALL_EXE_WIN_MSI"
+
+                wine_run_install "$AUTOINSTALL_EXE_WIN_MSI/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
+            print_info "Будут установлены и запущены службы aksusbd и hasplmd."
+            su_run "$WH_TMP_DIR/tflex17_aksusbd.sh" || TFLEX_ERROR=1
+            try_remove_file "$WH_TMP_DIR/tflex17_aksusbd.sh"
+        fi
+    fi
+
+    try_remove_dir "$AUTOINSTALL_DIR_LIN"
+    try_remove_dir "$AUTOINSTALL_DIR_WIN"
+
+    if [[ $TFLEX_ERROR == "1" ]] ; then
+        fatal "Произошла ошибка во время подготовки префикса, или установки компонентов ПО."
+    else
+        echo "t-flex-cad17-prepair" >> "$WINEPREFIX/winetricks.log"
+        try_remove_file "$AUTOINSTALL_ZIP_LIN"
+        try_remove_file "$AUTOINSTALL_ZIP_WIN"
+        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/t-flex-cad17-manual

@@ -0,0 +1,23 @@
+#!/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_wh_tflex_10-9_amd64"
+export BASE_PFX="tflex17_pfx_x64_v02"
+export WINEARCH="win64"
+export WH_WINDOWS_VER="10"
+export WINEPREFIX="tflex17"
+export WH_XDG_OPEN="log"
+export WH_USE_MESA_GL_OVERRIDE="1"
+
+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

@@ -1,9 +1,13 @@
 ##### WINE #####
 
+009c95bfe2df3f9264c9c5092f3e30ea7a168dd7869046058a718a70739602d4  wine_wh_tflex_10-9_amd64.tar.xz
 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
+61bec1230b37b8fcc69fd45f848b44fd88cc41fcdd5dc3080336d7da63660f40  wine-7.16.1-alt1-amd64.tar.xz
+6fea17fd131f57c2ebf7ca4c60d3c5a9e819afe16e5d0b77ecb750da99ae0e38  wine-7.16.1-alt1-i586.tar.xz
 
 ##### DXVK #####
 
@@ -13,6 +17,12 @@ 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
+
+##### FONTS #####
+405bfe3b7c7f80034837c05656535053305727ee4bf1d993521b67b71d08ebc6  extra_fonts_v01.tar.xz
+
 ##### PREFIX #####
 
 0e86cd9958d1bd1bfac99e23165a091a4ea2fa3e693c551f69aabeed5f681fea  defpfx_x86_v01.tar.xz
@@ -35,6 +45,10 @@ f4cb2f380ad8887f334c6eb3c272b343ae8de327764945266e9e74f8acbac69f  tflex17_pfx_x6
 # create with wine_x_tkg_10-0_amd64 (universal user: xuser)
 # winetricks isolate_home msxml6 ipamona opensymbol wenquanyi ucrtbase2019 uff unifont droid wenquanyizenhei remove_mono internal dotnet40 dotnet48 dotnet20sp2 eufonts takao d3dcompiler_47 fontsmooth=rgb vcrun2022 vlgothic andale arial comicsans courier georgia impact times trebuchet verdana webdings corefonts liberation sourcehansans baekmuk tahoma lucida
 
+be09f25bb795c5f912fad2d122c68c8aed937821255f161c2d75a4773d11a044  tflex17_pfx_x64_v02.tar.xz
+# create with wine_wh_tflex_10-9_amd64
+# winetricks isolate_home msxml6 ipamona opensymbol wenquanyi ucrtbase2019 uff unifont droid wenquanyizenhei remove_mono internal dotnet40 dotnet48 dotnet20 eufonts takao d3dcompiler_47 fontsmooth=rgb vcrun2022 vlgothic andale arial comicsans courier georgia impact times trebuchet verdana webdings corefonts liberation sourcehansans baekmuk tahoma lucida
+
 7edbd69b40b8ca3fb3594933c6cd37030180c494c08fd13cbd1a5b46565d65e6  ved_ctm_pfx_x86_v03.tar.xz
 # create with wine_x_tkg_10-0_amd64 (universal user: xuser)
 # winetricks isolate_home msxml6 mdac27 wsh57 jet40 vb6run mdac28 vcrun2022 msxml3 arial dotnet40 dotnet48 art2k7min vcrun6 andale comicsans courier georgia impact times trebuchet verdana webdings corefonts msls31 ie8
@@ -43,6 +57,10 @@ f4cb2f380ad8887f334c6eb3c272b343ae8de327764945266e9e74f8acbac69f  tflex17_pfx_x6
 # create with wine_x_tkg_10-0_amd64 (universal user: xuser)
 # winetricks vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8
 
+25ccbd6ac4f5e4f0f4c609a016db9251160e3559b56676d97751f870a43fe7ef  ved_ctm_pfx_x86_v05.tar.xz
+# create with wine_x_tkg_10-0_amd64 (universal user: xuser)
+# winetricks vb6run art2kmin mdac27 mdac28 arial jet40 dotnet452 dotnet46 msxml3 ie8 vcrun2019 dotnet7 dotnetdesktop7
+
 7ce0ff53b66bf6f3b1f8d398dddeec476a6ad9b0d0ab25cd303bf242c86c5513  alta_pfx_x86_v01.tar.xz
 # create with wine_x_tkg_10-0_amd64 (universal user: xuser)
 # winetricks isolate_home msxml6 mdac27 wsh57 jet40 vb6run mdac28 opensymbol msxml4 msxml3 native_oleaut32 eufonts mfc42 andale arial comicsans courier georgia impact times trebuchet verdana webdings corefonts tahoma lucida sourcehansans fakechinese fakejapanese fakekorean unifont cjkfonts

testinstall/abc-akkord-pos

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+# info_ru: Автоматизация контроля координации организационно-распорядительной деятельности. ПОС Редакция.
+########################################################################
+export WH_WINE_USE="wine-9.0.14-alt1-amd64"
+export WINEPREFIX="abccenter"
+export PROG_NAME="АВС АККОРД ПОС"
+export PROG_ICON="abc_akkord"
+export BASE_PFX="none"
+export WH_WINDOWS_VER="10"
+export WINEARCH="win64"
+# export INSTALL_DLL=""
+
+prepair_wine
+# Возможны точки либо нижнее подчеркивание в URL-адресе
+try_get_page "https://abccenter.ru/download-ru/"
+VERDATE=$(read_page | grep -oP 'akkord_pos_\K\d+[._]\d+[._]\d+[._]\d+_\d+-\d+-\d+')
+AUTOINSTALL_EXE="${WH_TMP_DIR}/akkord_pos_${VERDATE}.exe"
+
+if try_download "https://abccenter.ru/wp-content/soft/akkord_pos_${VERDATE}.exe" "${AUTOINSTALL_EXE}" ; then
+    wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
+    try_remove_file "$AUTOINSTALL_EXE"
+
+    WIN_FILE_EXEC="$DRIVE_C/ABC-Soft/AKKORD POS/ABCAKKORD.exe"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+fi

testinstall/abc-akkord-pro

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+# info_ru: Автоматизация контроля координации организационно-распорядительной деятельности. Профессиональная Редакция.
+########################################################################
+export WH_WINE_USE="wine-9.0.14-alt1-amd64"
+export WINEPREFIX="abccenter"
+export PROG_NAME="АВС АККОРД Профессиональный"
+export PROG_ICON="abc_akkord"
+export BASE_PFX="none"
+export WH_WINDOWS_VER="10"
+export WINEARCH="win64"
+# export INSTALL_DLL=""
+
+prepair_wine
+# Возможны точки либо нижнее подчеркивание в URL-адресе
+try_get_page "https://abccenter.ru/download-ru/"
+VERDATE=$(read_page | grep -oP 'akkord_pro_\K\d+[._]\d+[._]\d+[._]\d+_\d+-\d+-\d+')
+AUTOINSTALL_EXE="${WH_TMP_DIR}/akkord_pro_${VERDATE}.exe"
+
+if try_download "https://abccenter.ru/wp-content/soft/akkord_pro_${VERDATE}.exe" "${AUTOINSTALL_EXE}" ; then
+    wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
+    try_remove_file "$AUTOINSTALL_EXE"
+
+    WIN_FILE_EXEC="$DRIVE_C/ABC-Soft/AKKORD PRO/ABCAKKORD.exe"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+fi

testinstall/abc-bim-plugins

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+# info_ru: Комплект плагинов «Сметная система АВС» к BIM-системам.
+########################################################################
+export WH_WINE_USE="wine-9.0.14-alt1-amd64"
+export WINEPREFIX="abccenter"
+export PROG_NAME="ABC-BIM-Plugins-RU"
+export BASE_PFX="none"
+export WH_WINDOWS_VER="10"
+export WINEARCH="win64"
+# export INSTALL_DLL=""
+
+prepair_wine
+# Возможны точки либо нижнее подчеркивание в URL-адресе
+try_get_page "https://abccenter.ru/download-ru/"
+VERSION=$(read_page | grep -oP 'ABC-BIM-Plugins-RU_\K\d+[._]\d+[._]\d+'| sed -E 's/[._]/./g')
+AUTOINSTALL_EXE="${WH_TMP_DIR}/ABC-BIM-Plugins-RU_${VERSION}.exe"
+
+if try_download "https://abccenter.ru/wp-content/soft/ABC-BIM-Plugins-RU_${VERSION}_Setup.exe" "${AUTOINSTALL_EXE}" ; then
+    wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
+    try_remove_file "$AUTOINSTALL_EXE"
+fi

testinstall/abc-bim-ru

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+# info_ru: Интеграция сметной системы АВС с BIM-платформами.
+########################################################################
+export WH_WINE_USE="wine-9.0.14-alt1-amd64"
+export WINEPREFIX="abccenter"
+PROG_NAME=("BIM-смета АВС-RU" "АВС Рекомпозитор")
+export BASE_PFX="none"
+export WH_WINDOWS_VER="10"
+export WINEARCH="win64"
+# export INSTALL_DLL=""
+
+prepair_wine
+# Возможны точки либо нижнее подчеркивание в URL-адресе
+try_get_page "https://abccenter.ru/download-ru/"
+VERDATE=$(read_page | grep -oP 'Setup_ABC-BIM-RU_\K\d+[._]\d+_\d+-\d+-\d+')
+VERSION=$(read_page | grep -oP 'Setup_ABC-BIM-RU_\K\d+[._]\d+' | sed -E 's/[._]/./g')
+AUTOINSTALL_EXE="${WH_TMP_DIR}/Setup_ABC-BIM-RU_${VERDATE}_trial.exe"
+
+if try_download "https://abccenter.ru/wp-content/soft/Setup_ABC-BIM-RU_${VERDATE}_trial.exe" "${AUTOINSTALL_EXE}" ; then
+    wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
+    try_remove_file "$AUTOINSTALL_EXE"
+
+    WIN_FILE_EXEC="$DRIVE_C/ABC-Soft/ABC-RU/${VERSION}/Abc_win/Exec/Abc.exe"
+    WIN_FILE_EXEC1="$DRIVE_C/ABC-Soft/ABC RECOMPOSER/abcrecomposerwl.exe"
+
+    create_desktop "BIM-смета АВС-RU ${VERSION}" "$WIN_FILE_EXEC" "abc"
+    create_desktop "АВС Рекомпозитор" "$WIN_FILE_EXEC1" "abc-recomposerwl"
+fi

testinstall/abc-dps-ru

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+# info_ru: АВС-ЦСП предназначен для автоматизированного составления и выпуска спецификаций материалов и оборудования, а также формирования ведомостей объемов работ (ВОР) путем связывания материальных ресурсов, включаемых в спецификации, с видами работ.
+########################################################################
+export WH_WINE_USE="wine-9.0.14-alt1-amd64"
+export WINEPREFIX="abccenter"
+export PROG_NAME="Цифровая спецификация проекта"
+export PROG_ICON="abc-dps"
+export BASE_PFX="none"
+export WH_WINDOWS_VER="10"
+export WINEARCH="win64"
+# export INSTALL_DLL=""
+
+prepair_wine
+# Возможны точки либо нижнее подчеркивание в URL-адресе
+try_get_page "https://abccenter.ru/download-ru/"
+VERDATE=$(read_page | grep -oP 'Setup_ABC_DPS_RU_\K\d+[._]\d+_\d+-\d+-\d+')
+VERSION=$(read_page | grep -oP 'Setup_ABC_DPS_RU_\K\d+[._]\d+'| sed -E 's/[._]/./g')
+AUTOINSTALL_EXE="${WH_TMP_DIR}/Setup_ABC_DPS_RU_${VERDATE}.exe"
+
+if try_download "https://abccenter.ru/wp-content/soft/Setup_ABC_DPS_RU_${VERDATE}.exe" "${AUTOINSTALL_EXE}" ; then
+    wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
+    try_remove_file "$AUTOINSTALL_EXE"
+
+    WIN_FILE_EXEC="$DRIVE_C/ABC-Soft/ABC-DPS RU/${VERSION}/ABCSpecificate.exe"
+    create_desktop "$PROG_NAME RU ${VERSION}" "$WIN_FILE_EXEC" "$PROG_ICON"
+fi

testinstall/abc-erp-bim

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+# info_ru: Конвертер в формат АВС_ERP_BIM_XML.
+########################################################################
+export WH_WINE_USE="wine-9.0.14-alt1-amd64"
+export WINEPREFIX="abccenter"
+export PROG_NAME="Конвертер в формат АВС_ERP_BIM_XML"
+export PROG_ICON="abc-erp-bim"
+export BASE_PFX="none"
+export WH_WINDOWS_VER="10"
+export WINEARCH="win64"
+# export INSTALL_DLL=""
+
+prepair_wine
+AUTOINSTALL_EXE="${WH_TMP_DIR}/abc_erp_bim_converter.exe"
+
+if try_download "https://abccenter.ru/wp-content/soft/abc_erp_bim_converter.exe" "${AUTOINSTALL_EXE}" ; then
+    mkdir -p "$DRIVE_C/ABC-Soft/abc_erp_bim_converter"
+    try_copy_file "${AUTOINSTALL_EXE}" "$DRIVE_C/ABC-Soft/abc_erp_bim_converter"
+
+    try_remove_file "$AUTOINSTALL_EXE"
+
+    WIN_FILE_EXEC="$DRIVE_C/ABC-Soft/abc_erp_bim_converter.exe"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+fi

testinstall/abc-pir-ru

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+# info_ru: Программный продукт АВС «ПИР» предназначен для подготовки, расчета и выпуска смет на проектно-изыскательские работы.
+########################################################################
+export WH_WINE_USE="wine-9.0.14-alt1-amd64"
+export WINEPREFIX="abccenter"
+export PROG_NAME="АВС-ПИР"
+export PROG_ICON="abc-pir"
+export BASE_PFX="none"
+export WH_WINDOWS_VER="10"
+export WINEARCH="win64"
+# export INSTALL_DLL=""
+
+prepair_wine
+# Возможны точки либо нижнее подчеркивание в URL-адресе
+try_get_page "https://abccenter.ru/download-ru/"
+VERDATE=$(read_page | grep -oP 'Setup_ABC-PIR-RU_\K\d+[._]\d+_\d+-\d+-\d+')
+VERSION=$(read_page | grep -oP 'Setup_ABC-PIR-RU_\K\d+[._]\d+'| sed -E 's/[._]/./g')
+AUTOINSTALL_EXE="${WH_TMP_DIR}/Setup_ABC-PIR-RU_${VERDATE}.exe"
+
+if try_download "https://abccenter.ru/wp-content/soft/Setup_ABC-PIR-RU_${VERDATE}.exe" "${AUTOINSTALL_EXE}" ; then
+    wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
+    try_remove_file "$AUTOINSTALL_EXE"
+
+    WIN_FILE_EXEC="$DRIVE_C/ABC-Soft/ABC-PIR/${VERSION}RU/ABC-PIR.exe"
+    create_desktop "$PROG_NAME ${VERSION}RU" "$WIN_FILE_EXEC" "$PROG_ICON"
+fi

testinstall/abc-recomposer

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+# info_ru: Программный комплекс АВС-Рекомпозитор.
+########################################################################
+export WH_WINE_USE="wine-9.0.14-alt1-amd64"
+export WINEPREFIX="abccenter"
+export PROG_NAME="АВС Рекомпозитор"
+export PROG_ICON="abc-recomposerwl"
+export BASE_PFX="none"
+export WH_WINDOWS_VER="10"
+export WINEARCH="win64"
+# export INSTALL_DLL=""
+
+prepair_wine
+# Возможны точки либо нижнее подчеркивание в URL-адресе
+try_get_page "https://abccenter.ru/download-ru/"
+VERDATE=$(read_page | grep -oP 'abcrecomposer_\K\d+[._]\d+[._]\d+-\d+-\d+')
+VERSION=$(read_page | grep -oP 'abcrecomposer_\K\d+[._]\d+' | sed -E 's/[._]/./g')
+AUTOINSTALL_EXE="${WH_TMP_DIR}/Setup_ABC-RU_${VERDATE}.exe"
+
+if try_download "https://abccenter.ru/wp-content/soft/abcrecomposer_${VERDATE}.exe" "${AUTOINSTALL_EXE}" ; then
+    wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
+    try_remove_file "$AUTOINSTALL_EXE"
+
+    WIN_FILE_EXEC="$DRIVE_C/ABC-Soft/ABC RECOMPOSER/${VERSION}/abcrecomposerwl.exe"
+    create_desktop "$PROG_NAME $VERSION" "$WIN_FILE_EXEC" "$PROG_ICON"
+fi

testinstall/abc-ru

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+# info_ru: Система АВС предназначена для разработки сметной и ресурсной документации всеми участниками инвестиционного процесса: проектными, подрядными организациями и заказчиками строительства.
+########################################################################
+export WH_WINE_USE="wine-9.0.14-alt1-amd64"
+export WINEPREFIX="abccenter"
+export PROG_NAME="ABC-RU"
+export PROG_ICON="abc"
+export BASE_PFX="none"
+export WH_WINDOWS_VER="10"
+export WINEARCH="win64"
+# export INSTALL_DLL=""
+
+prepair_wine
+# Возможны точки либо нижнее подчеркивание в URL-адресе
+try_get_page "https://abccenter.ru/download-ru/"
+VERDATE=$(read_page | grep -oP 'Setup_ABC-RU_\K\d+[._]\d+[._]\d+-\d+-\d+')
+VERSION=$(read_page | grep -oP 'Setup_ABC-RU_\K\d+[._]\d+' | sed -E 's/[._]/./g')
+AUTOINSTALL_EXE="${WH_TMP_DIR}/Setup_ABC-RU_${VERDATE}.exe"
+
+if try_download "https://abccenter.ru/wp-content/soft/Setup_ABC-RU_${VERDATE}.exe" "${AUTOINSTALL_EXE}" ; then
+    wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
+    try_remove_file "$AUTOINSTALL_EXE"
+
+    WIN_FILE_EXEC="$DRIVE_C/ABC-Soft/ABC-RU/${VERSION}/Abc_win/Exec/Abc.exe"
+    create_desktop "$PROG_NAME $VERSION" "$WIN_FILE_EXEC" "$PROG_ICON"
+fi

testinstall/commfort-client

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+# info_ru: Локальный корпоративный чат/мессенджер с поддержкой видеоконференций.
+########################################################################
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export WINEPREFIX="commfort"
+export PROG_NAME="CommFort"
+export PROG_ICON="commfort-client"
+export WH_WINDOWS_VER="10"
+export WINEARCH="win32"
+
+AUTOINSTALL_MSI="${WH_TMP_DIR}/commfort_client.msi"
+
+prepair_wine
+if try_download "https://www.commfort.com/download/commfort_client.msi" "${AUTOINSTALL_MSI}" ; then
+    wine_run_install "${AUTOINSTALL_MSI}" /q
+    try_remove_file "$AUTOINSTALL_MSI"
+
+    WIN_FILE_EXEC="$DRIVE_C/Program Files/CommFort/CommFort.exe"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+fi

testinstall/commfort-server

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+# info_ru: (Сервер) Локальный корпоративный чат/мессенджер с поддержкой видеоконференций.
+########################################################################
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export WINEPREFIX="commfort"
+export PROG_NAME="CommFort server"
+export PROG_ICON="commfort-server"
+export WH_WINDOWS_VER="10"
+export WINEARCH="win32"
+
+PACKZIP="${WH_TMP_DIR}/commfort_server.zip"
+AUTOINSTALL_UNPACK="${WH_TMP_DIR}/commfort_server"
+AUTOINSTALL_EXE="${WH_TMP_DIR}/commfort_server/commfort_server_599.exe"
+
+prepair_wine
+if try_download "https://www.commfort.com/download/commfort_server.zip" "${PACKZIP}" ; then
+    unpack "${PACKZIP}" "$AUTOINSTALL_UNPACK"
+    wine_run_install "$AUTOINSTALL_EXE" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
+    try_remove_file "$PACKZIP"
+    try_remove_dir "$AUTOINSTALL_UNPACK"
+
+    WIN_FILE_EXEC="$DRIVE_C/Program Files/CommFort_server/CommFort_server.exe"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+fi

testinstall/rtsim

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+# info_ru: Цифровая платформа для обучения и оценки специалистов нефтегазовой отрасли.
+########################################################################
+export WH_WINE_USE="wine_x_tkg_10-0_i586"
+export PROG_NAME="РТСИМ.Карьера"
+export WINEPREFIX="rtsim"
+export PROG_ICON="rtsim"
+export WH_WINDOWS_VER="10"
+export BASE_PFX="none"
+export WINEARCH="win32"
+export INSTALL_DLL="dotnet48"
+
+AUTOINSTALL_RAR="${WH_TMP_DIR}/РТСИМ.Карьера.rar"
+AUTOINSTALL_MSI="${WH_TMP_DIR}/РТСИМ.Карьера/РТСИМ.Карьера.msi"
+
+prepair_wine
+if try_download "https://rtsim.ru/РТСИМ.Карьера.rar" "$AUTOINSTALL_RAR" ; then
+    unpack "${AUTOINSTALL_RAR}" "${WH_TMP_DIR}"
+    wine_run_install "$AUTOINSTALL_MSI" /q
+    try_remove_file "$AUTOINSTALL_RAR"
+    try_remove_dir "${WH_TMP_DIR}/РТСИМ.Карьера"
+
+    WIN_FILE_EXEC="$DRIVE_C/РТСИМ/Карьера/RTsimTrenager.exe"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+fi

testinstall/swman-modus

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+# info_ru: Программный комплекс для энергетики.
+########################################################################
+export WH_WINE_USE="wine-9.0.14-alt1-amd64"
+export WINEPREFIX="swmanmodus"
+export BASE_PFX="none"
+export WH_WINDOWS_VER="10"
+export WINEARCH="win64"
+# export INSTALL_DLL=""
+
+prepair_wine
+# Ссылка для загрузки дистрибутива меняется в зависимости от версии
+AUTOINSTALL_EXE="${WH_TMP_DIR}/modus710.msi"
+DRIVE_C_MODUS="$DRIVE_C/Program Files (x86)/Modus 7.10/bin"
+
+if try_download "https://www.swman.ru/download/710/modus710.msi" "${AUTOINSTALL_EXE}" ; then
+    wine_run_install "${AUTOINSTALL_EXE}" /q
+    try_remove_file "$AUTOINSTALL_EXE"
+
+    declare -a PROG_NAME=("Аниматор" "Диспетчер" "Графический Редактор" "Имитатор АРМ" "Просмотрщик" "Просмот Результатов" "Тренажер")
+
+    declare -a PROG_ICON=("animator" "ol" "sdedit" "swimitator" "sexplore" "resmanagdb" "simswitch")
+
+    declare -a WIN_FILE_EXEC=("${DRIVE_C_MODUS}/Animator.exe" "${DRIVE_C_MODUS}/OL.exe" "${DRIVE_C_MODUS}/Sdedit32.exe" "${DRIVE_C_MODUS}/SwImitator.exe" "${DRIVE_C_MODUS}/SExplore.exe" "${DRIVE_C_MODUS}/ResManagDB.exe" "${DRIVE_C_MODUS}/SimSwitch.exe")
+
+    for i in "${!PROG_NAME[@]}"; do
+        create_desktop "${PROG_NAME[i]}" "${WIN_FILE_EXEC[i]}" "${PROG_ICON[i]}"
+    done
+fi