Merge branch 'minergenon-devel'

the function of extracting an icon from an exe file is combined with the creation of a desktop file
added the function of automatic prefix detection if it is not specified

CHANGELOG

@@ -1,5 +1,14 @@
 История изменений:
 
+0.5.4:
+* обновлен графический режим Qt5:
+    - добавлена возможность установки системных зависимостей
+    - исправлены/улучшены основные функции
+    - добавлено управление префиксами (в разработке)
+    - добавлена возможность создания ярлыка
+* добавлено автоматическое создание иконки для ярлыков (desktop файлов)
+* префикс tflex17 переименован в tflex (т.к. 18-я версия работает в том же префиксе)
+
 0.5.3:
 * исправлена установка grdcontrol для t-flex-*
 * обновлен графический режим Qt5

auto_completion/bash_completion/winehelper

@@ -4,7 +4,7 @@ _winehelper_completions() {
     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 --changelog changelog"
+    opts="--help --version --debug install installed install-dxvk install-vkd3d -r -i remove-all --clear-pfx killall remove-prefix backup-prefix restore-prefix create-prefix --changelog changelog change-wine"
     wine_cmd="winecfg winereg winefile wineconsole winetricks desktop regedit explorer cmd run"
 
     case "${prev}" in
@@ -34,6 +34,20 @@ _winehelper_completions() {
         restore-prefix)
             return 0
             ;;
+        install-dxvk|install-vkd3d)
+            local versions=$(winehelper "${prev}" list 2>/dev/null | grep ' - ' | sed 's/ - //')
+            COMPREPLY=( $(compgen -W "${versions} none list" -- "${cur}") )
+            return 0
+            ;;
+        change-wine)
+            local wine_versions=$(awk '
+                /^#+\s*(WINE|WINE_LG|PROTON_LG|PROTON_STEAM)\s*#*$/ { in_group=1 }
+                /^#+/ { if (! ($0 ~ /^#+\s*(WINE|WINE_LG|PROTON_LG|PROTON_STEAM)\s*#*$/)) in_group=0 }
+                /^[a-f0-9]{64}/ && in_group { sub(/\.tar\.xz$/, "", $2); print $2 }
+            ' /usr/share/winehelper/sha256sum.list 2>/dev/null)
+            COMPREPLY=( $(compgen -W "system ${wine_versions}" -- "${cur}") )
+            return 0
+            ;;
         *)
             ;;
     esac

auto_completion/zsh_completion/_winehelper

@@ -8,15 +8,19 @@ _winehelper() {
     '--version[Показать информацию о пакете и его версии]'
     '--debug[Режим отладки]'
     'install[Запустить скрипт установки программы]'
+    'install-dxvk[Установить/удалить DXVK]'
+    'install-vkd3d[Установить/удалить VKD3D]'
     'installed[Список установленных программ]'
     '-r[Запуск программы (отладка)]'
     '-i[Запустить скрипт установки программы]'
     'remove-all[Удалить WineHelper и все связанные данные]'
     '--clear-pfx[Очистить префикс \[имя_префикса\]]'
     'killall[Убить все процессы]'
+    'create-prefix[Создать новый префикс]'
     'remove-prefix[Удалить префикс и все связанные данные]'
     'backup-prefix[Создать резерную копию префикса]'
     'restore-prefix[восстановить префикс из резервной копии "путь/до/whpack"]'
+    'change-wine[Изменить версию Wine/Proton для префикса]'
   )
 
   wine_cmd=(
@@ -55,9 +59,20 @@ _winehelper() {
         remove-prefix|backup-prefix)
           _get_prefixes
           ;;
+        create-prefix)
+          ;;
         restore-prefix)
           _files
           ;;
+        install-dxvk)
+          _get_component_versions 'install-dxvk'
+          ;;
+        install-vkd3d)
+          _get_component_versions 'install-vkd3d'
+          ;;
+        change-wine)
+          _get_wine_versions
+          ;;
         *)
           _values 'winehelper options' "${opts[@]}" "${wine_cmd[@]}"
           ;;
@@ -66,6 +81,32 @@ _winehelper() {
   esac
 }
 
+_get_component_versions () {
+  local component_command=$1
+  local -a versions
+
+  versions=( ${(f)"$(winehelper "${component_command}" list 2>/dev/null | grep ' - ' | sed 's/ - //')" } )
+  versions+=(none list)
+
+  _values 'versions' "${versions[@]}"
+}
+
+_get_wine_versions () {
+  local -a versions
+  local sha256_file="/usr/share/winehelper/sha256sum.list"
+
+  if [[ -f "$sha256_file" ]]; then
+    versions=( ${(f)"$(awk '
+        /^#+\s*(WINE|WINE_LG|PROTON_LG|PROTON_STEAM)\s*#*$/ { in_group=1 }
+        /^#+/ { if (! ($0 ~ /^#+\s*(WINE|WINE_LG|PROTON_LG|PROTON_STEAM)\s*#*$/)) in_group=0 }
+        /^[a-f0-9]{64}/ && in_group { sub(/\.tar\.xz$/, "", $2); print $2 }
+    ' "$sha256_file" 2>/dev/null)"} )
+  fi
+
+  versions+=(system)
+  _values 'wine/proton versions' "${versions[@]}"
+}
+
 _get_prefixes () {
   prefixes=( ${(f)"$(ls -1 ~/.local/share/winehelper/prefixes 2>/dev/null)"} )
 

autoinstall/arm-kt-att

@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# info_ru: Программа “АРМ КТ ПРОФ АТТЕСТАТ” для документов об основном общем, среднем общем образовании.
+########################################################################
+export PROG_URL="https://armregistr.ru/programmnoe-obespechenie/licenziya-na-programmnoe-obespechenie-dlya-zapolneniya-blank-4"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export WINEPREFIX="arm-kt"
+export PROG_NAME="АРМ КТ ПРОФ АТТЕСТАТ"
+export PROG_ICON="armkt"
+export BASE_PFX="none"
+export WINEARCH="win64"
+export INSTALL_DLL=""
+export WH_WINDOWS_VER="7"
+
+AUTOINSTALL_URL=$(curl -s "$PROG_URL" | grep "setup.zip" | awk -F'"' '{print $2}')
+SHORT_NAME=$(echo $AUTOINSTALL_URL | awk -F'/' '{print $5}')
+VER_EXE=$(echo $AUTOINSTALL_URL | grep -o '[0-9]\+\.[0-9]\+\.[0-9]\+')
+AUTOINSTALL_ZIP="${WH_TMP_DIR}/$SHORT_NAME-$VER_EXE-setup.zip"
+AUTOINSTALL_EXE="${WH_TMP_DIR}/$SHORT_NAME-$VER_EXE-setup.exe"
+
+if [[ -z $VER_EXE ]]
+then fatal "Не удалось получить версию ПО со страницы на сайте!"
+else print_info "Устанавливаем $PROG_NAME версии $VER_EXE"
+fi
+
+prepair_wine
+
+if try_download "$AUTOINSTALL_URL" "$AUTOINSTALL_ZIP" ; then
+    unpack "$AUTOINSTALL_ZIP" "${WH_TMP_DIR}"
+    try_remove_file "$AUTOINSTALL_ZIP"
+
+    wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT
+    try_remove_file "${AUTOINSTALL_EXE}"
+
+    create_desktop "$PROG_NAME" \
+    "$DRIVE_C/Program Files/KtSoftware/$SHORT_NAME/$SHORT_NAME.exe" "$PROG_ICON"
+
+    create_desktop "Регистрация $PROG_NAME" \
+    "$DRIVE_C/Program Files/KtSoftware/$SHORT_NAME/${SHORT_NAME}Reg.exe" "$PROG_ICON"
+fi

autoinstall/arm-kt-dpp

@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# info_ru: Программа “АРМ КТ ПРОФ ДПП” для заполнения бланков документов о повышении квалификации и профессиональной переподготовке.
+########################################################################
+export PROG_URL="https://armregistr.ru/programmnoe-obespechenie/licenziya-na-programmnoe-obespechenie-dlya-zapolneniya-blank"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export WINEPREFIX="arm-kt"
+export PROG_NAME="АРМ КТ ПРОФ ДПП"
+export PROG_ICON="armkt"
+export BASE_PFX="none"
+export WINEARCH="win64"
+export INSTALL_DLL=""
+export WH_WINDOWS_VER="7"
+
+AUTOINSTALL_URL=$(curl -s "$PROG_URL" | grep "setup.zip" | awk -F'"' '{print $2}')
+SHORT_NAME=$(echo $AUTOINSTALL_URL | awk -F'/' '{print $5}')
+VER_EXE=$(echo $AUTOINSTALL_URL | grep -o '[0-9]\+\.[0-9]\+\.[0-9]\+')
+AUTOINSTALL_ZIP="${WH_TMP_DIR}/$SHORT_NAME-$VER_EXE-setup.zip"
+AUTOINSTALL_EXE="${WH_TMP_DIR}/$SHORT_NAME-$VER_EXE-setup.exe"
+
+if [[ -z $VER_EXE ]]
+then fatal "Не удалось получить версию ПО со страницы на сайте!"
+else print_info "Устанавливаем $PROG_NAME версии $VER_EXE"
+fi
+
+prepair_wine
+
+if try_download "$AUTOINSTALL_URL" "$AUTOINSTALL_ZIP" ; then
+    unpack "$AUTOINSTALL_ZIP" "${WH_TMP_DIR}"
+    try_remove_file "$AUTOINSTALL_ZIP"
+
+    wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT
+    try_remove_file "${AUTOINSTALL_EXE}"
+
+    create_desktop "$PROG_NAME" \
+    "$DRIVE_C/Program Files/KtSoftware/$SHORT_NAME/$SHORT_NAME.exe" "$PROG_ICON"
+
+    create_desktop "Регистрация $PROG_NAME" \
+    "$DRIVE_C/Program Files/KtSoftware/$SHORT_NAME/${SHORT_NAME}Reg.exe" "$PROG_ICON"
+fi

autoinstall/arm-kt-es

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+# info_ru: Программа “АРМ КТ ПРОФ НШ” для заполнения бланков документов об окончании начальной школы.
+########################################################################
+export PROG_URL="https://armregistr.ru/programmnoe-obespechenie/licenziya-na-programmnoe-obespechenie-dlya-zapolneniya-blank-1"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export WINEPREFIX="arm-kt"
+export PROG_NAME="АРМ КТ ПРОФ НШ"
+export PROG_ICON="armkt"
+export BASE_PFX="none"
+export WINEARCH="win64"
+export INSTALL_DLL=""
+export WH_WINDOWS_VER="7"
+
+AUTOINSTALL_URL=$(curl -s "$PROG_URL" | grep "setup.exe" | awk -F'"' '{print $2}')
+SHORT_NAME=$(echo $AUTOINSTALL_URL | awk -F'/' '{print $5}')
+VER_EXE=$(echo $AUTOINSTALL_URL | grep -o '[0-9]\+\.[0-9]\+\.[0-9]\+')
+AUTOINSTALL_EXE="${WH_TMP_DIR}/$SHORT_NAME-$VER_EXE-setup.exe"
+
+if [[ -z $VER_EXE ]]
+then fatal "Не удалось получить версию ПО со страницы на сайте!"
+else print_info "Устанавливаем $PROG_NAME версии $VER_EXE"
+fi
+
+prepair_wine
+
+if try_download "$AUTOINSTALL_URL" "$AUTOINSTALL_EXE" ; then
+    wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT
+    try_remove_file "${AUTOINSTALL_EXE}"
+
+    create_desktop "$PROG_NAME" \
+    "$DRIVE_C/Program Files/KtSoftware/$SHORT_NAME/$SHORT_NAME.exe" "$PROG_ICON"
+
+    create_desktop "Регистрация $PROG_NAME" \
+    "$DRIVE_C/Program Files/KtSoftware/$SHORT_NAME/${SHORT_NAME}Reg.exe" "$PROG_ICON"
+fi

autoinstall/arm-kt-med

@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# info_ru: Программа “АРМ КТ ПРОФ МЕД” для заполнения бланков документов о послевузовском профессиональном образовании и сертификатов специалиста.
+######################################################
+export PROG_URL="https://armregistr.ru/programmnoe-obespechenie/licenziya-na-programmnoe-obespechenie-dlya-zapolneniya-blank-3"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export WINEPREFIX="arm-kt"
+export PROG_NAME="АРМ КТ ПРОФ МЕД"
+export PROG_ICON="armkt"
+export BASE_PFX="none"
+export WINEARCH="win64"
+export INSTALL_DLL=""
+export WH_WINDOWS_VER="7"
+
+AUTOINSTALL_URL=$(curl -s "$PROG_URL" | grep "setup.zip" | awk -F'"' '{print $2}')
+SHORT_NAME=$(echo $AUTOINSTALL_URL | awk -F'/' '{print $5}')
+VER_EXE=$(echo $AUTOINSTALL_URL | grep -o '[0-9]\+\.[0-9]\+\.[0-9]\+')
+AUTOINSTALL_ZIP="${WH_TMP_DIR}/$SHORT_NAME-$VER_EXE-setup.zip"
+AUTOINSTALL_EXE="${WH_TMP_DIR}/$SHORT_NAME-$VER_EXE-setup.exe"
+
+if [[ -z $VER_EXE ]]
+then fatal "Не удалось получить версию ПО со страницы на сайте!"
+else print_info "Устанавливаем $PROG_NAME версии $VER_EXE"
+fi
+
+prepair_wine
+
+if try_download "$AUTOINSTALL_URL" "$AUTOINSTALL_ZIP" ; then
+    unpack "$AUTOINSTALL_ZIP" "${WH_TMP_DIR}"
+    try_remove_file "$AUTOINSTALL_ZIP"
+
+    wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT
+    try_remove_file "${AUTOINSTALL_EXE}"
+
+    create_desktop "$PROG_NAME" \
+    "$DRIVE_C/Program Files/KtSoftware/$SHORT_NAME/$SHORT_NAME.exe" "$PROG_ICON"
+
+    create_desktop "Регистрация $PROG_NAME" \
+    "$DRIVE_C/Program Files/KtSoftware/$SHORT_NAME/${SHORT_NAME}Reg.exe" "$PROG_ICON"
+fi

autoinstall/arm-kt-prof

@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# info_ru: Программа “АРМ КТ ПРОФ ПРОФЕССИЯ” для заполнения бланков документов профессионального обучения.
+########################################################################
+export PROG_URL="https://armregistr.ru/programmnoe-obespechenie/licenziya-na-programmnoe-obespechenie-dlya-zapolneniya-blank-5"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export WINEPREFIX="arm-kt"
+export PROG_NAME="АРМ КТ ПРОФ ПРОФЕССИЯ"
+export PROG_ICON="armkt"
+export BASE_PFX="none"
+export WINEARCH="win64"
+export INSTALL_DLL=""
+export WH_WINDOWS_VER="7"
+
+AUTOINSTALL_URL=$(curl -s "$PROG_URL" | grep "setup.zip" | awk -F'"' '{print $2}')
+SHORT_NAME=$(echo $AUTOINSTALL_URL | awk -F'/' '{print $5}')
+VER_EXE=$(echo $AUTOINSTALL_URL | grep -o '[0-9]\+\.[0-9]\+\.[0-9]\+')
+AUTOINSTALL_ZIP="${WH_TMP_DIR}/$SHORT_NAME-$VER_EXE-setup.zip"
+AUTOINSTALL_EXE="${WH_TMP_DIR}/$SHORT_NAME-$VER_EXE-setup.exe"
+
+if [[ -z $VER_EXE ]]
+then fatal "Не удалось получить версию ПО со страницы на сайте!"
+else print_info "Устанавливаем $PROG_NAME версии $VER_EXE"
+fi
+
+prepair_wine
+
+if try_download "$AUTOINSTALL_URL" "$AUTOINSTALL_ZIP" ; then
+    unpack "$AUTOINSTALL_ZIP" "${WH_TMP_DIR}"
+    try_remove_file "$AUTOINSTALL_ZIP"
+
+    wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT
+    try_remove_file "${AUTOINSTALL_EXE}"
+
+    create_desktop "$PROG_NAME" \
+    "$DRIVE_C/Program Files/KtSoftware/$SHORT_NAME/$SHORT_NAME.exe" "$PROG_ICON"
+
+    create_desktop "Регистрация $PROG_NAME" \
+    "$DRIVE_C/Program Files/KtSoftware/$SHORT_NAME/${SHORT_NAME}Reg.exe" "$PROG_ICON"
+fi

autoinstall/arm-kt-spo

@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# info_ru: Программа “АРМ КТ ПРОФ СПО” для заполнения бланков документов о среднем профессиональном образовании.
+########################################################################
+export PROG_URL="https://armregistr.ru/programmnoe-obespechenie/licenziya-na-programmnoe-obespechenie-dlya-zapolneniya-blank-2"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export WINEPREFIX="arm-kt"
+export PROG_NAME="АРМ КТ ПРОФ СПО"
+export PROG_ICON="armkt"
+export BASE_PFX="none"
+export WINEARCH="win64"
+export INSTALL_DLL=""
+export WH_WINDOWS_VER="7"
+
+AUTOINSTALL_URL=$(curl -s "$PROG_URL" | grep "setup.zip" | awk -F'"' '{print $2}')
+SHORT_NAME=$(echo $AUTOINSTALL_URL | awk -F'/' '{print $5}')
+VER_EXE=$(echo $AUTOINSTALL_URL | grep -o '[0-9]\+\.[0-9]\+\.[0-9]\+')
+AUTOINSTALL_ZIP="${WH_TMP_DIR}/$SHORT_NAME-$VER_EXE-setup.zip"
+AUTOINSTALL_EXE="${WH_TMP_DIR}/$SHORT_NAME-$VER_EXE-setup.exe"
+
+if [[ -z $VER_EXE ]]
+then fatal "Не удалось получить версию ПО со страницы на сайте!"
+else print_info "Устанавливаем $PROG_NAME версии $VER_EXE"
+fi
+
+prepair_wine
+
+if try_download "$AUTOINSTALL_URL" "$AUTOINSTALL_ZIP" ; then
+    unpack "$AUTOINSTALL_ZIP" "${WH_TMP_DIR}"
+    try_remove_file "$AUTOINSTALL_ZIP"
+
+    wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT
+    try_remove_file "${AUTOINSTALL_EXE}"
+
+    create_desktop "$PROG_NAME" \
+    "$DRIVE_C/Program Files/KtSoftware/$SHORT_NAME/$SHORT_NAME.exe" "$PROG_ICON"
+
+    create_desktop "Регистрация $PROG_NAME" \
+    "$DRIVE_C/Program Files/KtSoftware/$SHORT_NAME/${SHORT_NAME}Reg.exe" "$PROG_ICON"
+fi

autoinstall/arm-kt-vuz

@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# info_ru: Программа “АРМ КТ ПРОФ ВУЗ” для заполнения бланков документов о высшем образовании.
+########################################################################
+export PROG_URL="https://armregistr.ru/programmnoe-obespechenie/licenziya-na-programmnoe-obespechenie-dlya-zapolneniya-blank-6"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export WINEPREFIX="arm-kt"
+export PROG_NAME="АРМ КТ ПРОФ ВУЗ"
+export PROG_ICON="armkt"
+export BASE_PFX="none"
+export WINEARCH="win64"
+export INSTALL_DLL=""
+export WH_WINDOWS_VER="7"
+
+AUTOINSTALL_URL=$(curl -s "$PROG_URL" | grep "setup.zip" | awk -F'"' '{print $2}')
+SHORT_NAME=$(echo $AUTOINSTALL_URL | awk -F'/' '{print $5}')
+VER_EXE=$(echo $AUTOINSTALL_URL | grep -o '[0-9]\+\.[0-9]\+\.[0-9]\+')
+AUTOINSTALL_ZIP="${WH_TMP_DIR}/$SHORT_NAME-$VER_EXE-setup.zip"
+AUTOINSTALL_EXE="${WH_TMP_DIR}/$SHORT_NAME-$VER_EXE-setup.exe"
+
+if [[ -z $VER_EXE ]]
+then fatal "Не удалось получить версию ПО со страницы на сайте!"
+else print_info "Устанавливаем $PROG_NAME версии $VER_EXE"
+fi
+
+prepair_wine
+
+if try_download "$AUTOINSTALL_URL" "$AUTOINSTALL_ZIP" ; then
+    unpack "$AUTOINSTALL_ZIP" "${WH_TMP_DIR}"
+    try_remove_file "$AUTOINSTALL_ZIP"
+
+    wine_run_install "${AUTOINSTALL_EXE}" /VERYSILENT
+    try_remove_file "${AUTOINSTALL_EXE}"
+
+    create_desktop "$PROG_NAME" \
+    "$DRIVE_C/Program Files/KtSoftware/$SHORT_NAME/$SHORT_NAME.exe" "$PROG_ICON"
+
+    create_desktop "Регистрация $PROG_NAME" \
+    "$DRIVE_C/Program Files/KtSoftware/$SHORT_NAME/${SHORT_NAME}Reg.exe" "$PROG_ICON"
+fi

autoinstall/scadoffice

@@ -6,10 +6,10 @@ export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="scadoffice"
 export PROG_NAME="SCAD Office"
 export PROG_ICON="scadoffice"
-export BASE_PFX="scadaoffice_pfx_x64_v03"
+export BASE_PFX="scadaoffice_pfx_x64_v04"
 export WH_WINDOWS_VER="10"
 export WINEARCH="win64"
-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 INSTALL_DLL="dotnet20 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"

database/t-flex-cad17.whdb

@@ -5,7 +5,7 @@ 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 WINEPREFIX="tflex"
 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"

manualinstall/nettest

@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# info_ru: Установщик программного комплекса NetTest (демо-версия)
+########################################################################
+export PROG_URL="https://www.kpolyakov.spb.ru/prog/nettest/nettget.htm"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export WINEPREFIX="nettest"
+export PROG_NAME="NetTest"
+export BASE_PFX="none"
+export WINEARCH="win64"
+export INSTALL_DLL=""
+export WH_WINDOWS_VER="10"
+
+ZIP_FILE="$2"
+
+if [[ -f "$ZIP_FILE" ]] \
+&& [[ $ZIP_FILE =~ ".zip" ]]
+then
+    prepair_wine
+    PROG_PATH="$DRIVE_C/nettest"
+    if [[ $ZIP_FILE =~ "tests" ]] ; then
+        unpack "$2" "$PROG_PATH/tests"
+        print_info "Тесты $(basename "$ZIP_FILE") установлены."
+        exit 0
+    else
+        unpack "$2" "$PROG_PATH"
+    fi
+
+    cp -fr "$PROG_PATH/fonts/"* "$DRIVE_C/windows/Fonts/"
+
+    create_desktop "$PROG_NAME (Сервер)" "$PROG_PATH/testser.exe" "nettest_server"
+    create_desktop "$PROG_NAME (Клиент)" "$PROG_PATH/testcli.exe" "nettest_client"
+else
+    fatal "Не найден файл архива для $PROG_NAME. Перезапустите по примеру:
+    winehelper install $1 \"/путь/до/архива\""
+fi
+
+
+
+

sha256sum.list

@@ -1,14 +1,15 @@
 ##### 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
+f1bf1261550ca2928cefacdb724926d3d6d103433d0ff6882ee9783a50d8f4e4  wine-8.8-staging-amd64.tar.xz
 61bec1230b37b8fcc69fd45f848b44fd88cc41fcdd5dc3080336d7da63660f40  wine-7.16.1-alt1-amd64.tar.xz
 6fea17fd131f57c2ebf7ca4c60d3c5a9e819afe16e5d0b77ecb750da99ae0e38  wine-7.16.1-alt1-i586.tar.xz
 
+##### WINE_LG #####
 765e52484f06169909b179f4884d04ae4b440ff868e4b5722e64fc7d7a036ad9  WINE_LG_10-10-1.tar.xz
 7a5128fcebbeed652ba36c5135821fd2c82493e87d715e8bc63e3210ba7ee849  WINE_LG_10-11.tar.xz
 373beeb85c1c8163e752a32a453dcf575dd7ecf971726cecb3195e330d094925  WINE_LG_10-12.tar.xz
@@ -25,6 +26,7 @@ da79f89b1fc3175f113bf5ec35fc2755550159034736cff086f2165480dd6e0f  WINE_LG_9-12-2
 51ff56e435a90eeff13ffbbac543a820d1df14d65f2e3b760ad100bc946e4bfc  WINE_LG_9-7.tar.xz
 09901b17a7aaa13e5c1a1f99ab82c9f0d223aa2f5c9ac94938e5a9a0088bb244  WINE_LG_9-9.tar.xz
 
+##### PROTON_LG #####
 d0f5b42096bc5ed379a26e415d99963f849129d5cec1ba9134b1ee50100b049b  PROTON_LG_10-10.tar.xz
 d87eb914ce7e5cab47e6b480aa400f8c7840f39a22d585bf35092a033ac09201  PROTON_LG_10-13.tar.xz
 05ca56607af7cee30b4797ad6c6a111d38a52c9d5c2184d30eec2650f1585b58  PROTON_LG_10-15.tar.xz
@@ -44,13 +46,13 @@ e09c5da9ddffc5d390de7689df1778f279cc84a946665cc76ce77861010b2604  PROTON_LG_9-4.
 56eae794a48aa7322ce5a636c490974d7f2516528d3153991fb033b0fa5fe3cf  PROTON_LG_9-5.tar.xz
 82263e1d0ab16130f15d419f2661fc5a7baf29193b9eeeb7eec3f01a3e54a1b3  PROTON_LG_9-7.tar.xz
 
+##### PROTON_STEAM #####
 09e6e386a87710996d634e08650bbc733365df65d3491a4372f06cf4e815a8b2  PROTON_STEAM_6.3-8.tar.xz
 2f8bdfeb75e5427886aac7d2a599a1ee8900e50d5873a0e620d5703707bf4271  PROTON_STEAM_7.0-5.tar.xz
 b33aca95664067c9eff06a2b4380992d43a5d31880ff970fb340e851671be625  PROTON_STEAM_8.0-4.tar.xz
 9a20af28f4213e4f1c532b79a20e6a95ef872130784fc306510637342c6f58a1  PROTON_STEAM_8.0-5.tar.xz
 
 ##### DXVK #####
-
 d1a86ca53ab7e156e1252d3cf7eed3c66fe0651699cfc9c4ba152024261d8258  dxvk-1.10.1-967.tar.xz
 98411effbc1b3611b11c4ca3af2ad29400b08e1c8c380791d6351600a06fb3c7  dxvk-1.10.3-28.tar.xz
 061568b51ce99d285ef2d0f1f31aab65b3e6fd34747073859c5a719bec2a7afd  dxvk-1.6.1.tar.xz
@@ -100,7 +102,6 @@ c02b565d2fca1dc4066fb58acfcdd3919386fdbb01b30cfe181d4dd02ac5f1bb  dxvk-2.7-5.tar
 5f97deb1eeb97ed41d0539264c0ca98e8841f79ec59684f32e7f1ca5c29a109b  dxvk-sarek-1.11.0.tar.xz
 
 ##### VKD3D #####
-
 df1a940d2e072a884524f66a16e0f0ef74048bc6a6642b96eb257528a522109f  vkd3d-proton-1.1-2602.tar.xz
 bc86b06af83054e25bad21fe4bec4c10538837221fe847470571df7d556d355b  vkd3d-proton-1.1-2967.tar.xz
 41bd2465015f069ef2d378e42a0f906fd40f1ce70e1602b36e445209b16e0d50  vkd3d-proton-1.1-3088.tar.xz
@@ -154,7 +155,6 @@ edf16d2b37bc77d121d5d81b06b60d3f694e0060c6606e729ceab30de3d27466  vkd3d-proton-s
 405bfe3b7c7f80034837c05656535053305727ee4bf1d993521b67b71d08ebc6  extra_fonts_v01.tar.xz
 
 ##### PREFIX #####
-
 0e86cd9958d1bd1bfac99e23165a091a4ea2fa3e693c551f69aabeed5f681fea  defpfx_x86_v01.tar.xz
 # create with wine_x_tkg_10-0_amd64 (universal user: xuser and isolate_home by default)
 # winetricks msxml3 msxml4 msxml6 andale arial comicsans courier georgia impact times trebuchet verdana webdings corefonts wsh57 vcrun6 mdac27 jet40 gdiplus lucida tahoma ucrtbase2019 vcrun2019
@@ -212,8 +212,8 @@ dfb44ce5e5af7dba1686932c63d6b05e5dd6919a21c78130a7d1d0271b93958e  audiorecstatio
 # create with wine_x_tkg_10-0_i586 (universal user: xuser)
 # winetricks arial dotnet7 dotnetdesktop7 renderer=gdi
 
-25e277c7afa4a9afc5f013cb05f872c12a7f381c4f0503a423dcacccca9a14c6  scadaoffice_pfx_x64_v03.tar.xz
-# create with wine_x_tkg_10-0_i586 (universal user: xuser)
+4fa93434c5c15440014357323257ddcee7d28b94ad6a56bd6f5a08b33ae4c3cb  scadaoffice_pfx_x64_v04.tar.xz
+# create with wine-8.8-staging-amd64
 # 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 ODBC, SSH, *.reg
 0f4ef434df07bc338ae308af44330590eaa1d9c94b64850514e55b960642d0eb  scadoffice_addons_v02.tar.xz

winehelper.desktop

@@ -1,3 +1,4 @@
+#!/usr/bin/env xdg-open
 [Desktop Entry]
 Name=WineHelper
 Exec=winehelper gui %F
@@ -7,3 +8,4 @@ Type=Application
 Categories=WineHelper;Utility;Emulator;
 StartupNotify=true
 Icon=winehelper
+StartupWMClass=winehelper