added NetTest (demo) to manualinstall

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 create-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,6 +8,8 @@ _winehelper() {
     '--version[Показать информацию о пакете и его версии]'
     '--debug[Режим отладки]'
     'install[Запустить скрипт установки программы]'
+    'install-dxvk[Установить/удалить DXVK]'
+    'install-vkd3d[Установить/удалить VKD3D]'
     'installed[Список установленных программ]'
     '-r[Запуск программы (отладка)]'
     '-i[Запустить скрипт установки программы]'
@@ -18,6 +20,7 @@ _winehelper() {
     'remove-prefix[Удалить префикс и все связанные данные]'
     'backup-prefix[Создать резерную копию префикса]'
     'restore-prefix[восстановить префикс из резервной копии "путь/до/whpack"]'
+    'change-wine[Изменить версию Wine/Proton для префикса]'
   )
 
   wine_cmd=(
@@ -61,6 +64,15 @@ _winehelper() {
         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[@]}"
           ;;
@@ -69,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"

manualinstall/nettest

@@ -0,0 +1,34 @@
+#!/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 PROG_ICON="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"
+    unpack "$2" "$PROG_PATH"
+
+    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

@@ -5,6 +5,7 @@
 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
 
@@ -211,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

@@ -7,18 +7,20 @@ if [[ $(id -u) -eq 0 ]] ; then
 fi
 
 ##### DEFAULT PATH #####
-export SCRIPT_NAME USER_WORK_PATH RUN_SCRIPT DATA_PATH CHANGELOG_FILE WH_ICON_PATH LICENSE_FILE AGREEMENT
+export SCRIPT_NAME USER_WORK_PATH RUN_SCRIPT DATA_PATH CHANGELOG_FILE WH_ICON_PATH LICENSE_FILE AGREEMENT THIRD_PARTY_FILE
 
 SCRIPT_NAME="$(basename "$0")"
 if [[ "$(realpath "$0")" == "/usr/bin/$SCRIPT_NAME" ]] ; then
     # переменные для установленного WineHelper в систему
+    WH_VERSION="$(rpm -q winehelper | awk -F'-' '{print $2}')"
     USER_WORK_PATH="$HOME/.local/share/$SCRIPT_NAME"
     RUN_SCRIPT="/usr/bin/$SCRIPT_NAME"
     DATA_PATH="/usr/share/$SCRIPT_NAME"
-    CHANGELOG_FILE="$(realpath "/usr/share/doc/winehelper"-*/CHANGELOG)"
     WH_ICON_PATH="$DATA_PATH/image/gui/winehelper.svg"
-    LICENSE_FILE="$(realpath "/usr/share/doc/winehelper"-*/LICENSE)"
-    AGREEMENT="$(realpath "/usr/share/doc/winehelper"-*/LICENSE_AGREEMENT)"
+    CHANGELOG_FILE="/usr/share/doc/winehelper-$WH_VERSION/CHANGELOG"
+    LICENSE_FILE="/usr/share/doc/winehelper-$WH_VERSION/LICENSE"
+    AGREEMENT="/usr/share/doc/winehelper-$WH_VERSION/LICENSE_AGREEMENT"
+    THIRD_PARTY_FILE="/usr/share/doc/winehelper-$WH_VERSION/THIRD-PARTY"
 else
     # переменные для тестового запуска WineHelper из репозитория
     USER_WORK_PATH="$HOME/test-$SCRIPT_NAME"
@@ -28,6 +30,7 @@ else
     WH_ICON_PATH="$DATA_PATH/image/gui/winehelper-devel.svg"
     LICENSE_FILE="$DATA_PATH/LICENSE"
     AGREEMENT="$DATA_PATH/LICENSE_AGREEMENT"
+    THIRD_PARTY_FILE="$DATA_PATH/THIRD-PARTY"
 
     # минимальная проверка синтаксиса скриптов
     for self_check_script in "$RUN_SCRIPT" \
@@ -614,6 +617,7 @@ create_desktop () {
         echo "StartupNotify=true"
         echo "Path=$DATA_PATH"
         echo "Icon=$icon_file"
+        echo "StartupWMClass=$(basename "$exe_file")"
     } > "$USER_WORK_PATH/$desktop_filename.desktop"
     chmod +x "$USER_WORK_PATH/$desktop_filename.desktop"
 
@@ -649,7 +653,7 @@ create_desktop () {
 [Desktop Entry]
 Type=Directory
 Name=WineHelper
-Icon=wine
+Icon=winehelper
 EOF
     fi
 
@@ -776,9 +780,10 @@ init_wined3d () {
 init_dxvk () {
     check_variables USE_DXVK_VER "$1"
 
-    get_dxvk () {
-        DXVK_URL="$1"
-        DXVK_PACKAGE="${WH_VULKAN_LIBDIR}/dxvk-${DXVK_VAR_VER}.tar.$(echo ${DXVK_URL#*.tar.})"
+    get_dxvk() {
+        local DXVK_URL="$1"
+        local DXVK_VAR_VER="$2"
+        local DXVK_PACKAGE="${WH_VULKAN_LIBDIR}/${DXVK_VAR_VER}.tar.$(echo "${DXVK_URL#*.tar.}")"
         if try_download "$DXVK_URL" "$DXVK_PACKAGE" check256sum \
         && unpack "$DXVK_PACKAGE" "$WH_VULKAN_LIBDIR"
         then
@@ -789,8 +794,8 @@ init_dxvk () {
     }
 
     for DXVK_VAR_VER in "$USE_DXVK_VER" $@ ; do
-        if [[ ! -d "${WH_VULKAN_LIBDIR}/dxvk-$DXVK_VAR_VER" ]] ; then
-            get_dxvk "$CLOUD_URL/dxvk-${DXVK_VAR_VER}.tar.xz"
+        if [[ ! -d "${WH_VULKAN_LIBDIR}/${DXVK_VAR_VER}" ]] ; then
+            get_dxvk "$CLOUD_URL/${DXVK_VAR_VER}.tar.xz" "$DXVK_VAR_VER"
         fi
     done
 
@@ -803,8 +808,8 @@ init_dxvk () {
     fi
 
     for dxvkfiles in $DXVK_FILES ; do
-        try_copy_other_dll_to_pfx_64 "${WH_VULKAN_LIBDIR}/dxvk-$USE_DXVK_VER/x64/$dxvkfiles.dll"
-        if try_copy_other_dll_to_pfx_32 "${WH_VULKAN_LIBDIR}/dxvk-$USE_DXVK_VER/x32/$dxvkfiles.dll"
+        try_copy_other_dll_to_pfx_64 "${WH_VULKAN_LIBDIR}/${USE_DXVK_VER}/x64/$dxvkfiles.dll"
+        if try_copy_other_dll_to_pfx_32 "${WH_VULKAN_LIBDIR}/${USE_DXVK_VER}/x32/$dxvkfiles.dll"
         then var_winedlloverride_update "$dxvkfiles=n"
         fi
     done
@@ -813,9 +818,10 @@ init_dxvk () {
 init_vkd3d () {
     check_variables USE_VKD3D_VER "$1"
 
-    get_vkd3d () {
-        VKD3D_URL="$1"
-        VKD3D_PACKAGE="${WH_VULKAN_LIBDIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.$(echo ${VKD3D_URL#*.tar.})"
+    get_vkd3d() {
+        local VKD3D_URL="$1"
+        local VKD3D_VAR_VER="$2"
+        local VKD3D_PACKAGE="${WH_VULKAN_LIBDIR}/${VKD3D_VAR_VER}.tar.$(echo "${VKD3D_URL#*.tar.}")"
         if try_download "$VKD3D_URL" "$VKD3D_PACKAGE" check256sum \
         && unpack "$VKD3D_PACKAGE" "$WH_VULKAN_LIBDIR"
         then
@@ -826,15 +832,15 @@ init_vkd3d () {
     }
 
     for VKD3D_VAR_VER in "$USE_VKD3D_VER" $@ ; do
-        if [[ ! -d "${WH_VULKAN_LIBDIR}/vkd3d-proton-$VKD3D_VAR_VER" ]] ; then
-            get_vkd3d "$CLOUD_URL/vkd3d-proton-${VKD3D_VAR_VER}.tar.xz"
+        if [[ ! -d "${WH_VULKAN_LIBDIR}/${VKD3D_VAR_VER}" ]] ; then
+            get_vkd3d "$CLOUD_URL/${VKD3D_VAR_VER}.tar.xz" "$VKD3D_VAR_VER"
         fi
     done
 
     VKD3D_FILES="d3d12 d3d12core libvkd3d-shader-1 libvkd3d-1" # libvkd3d-proton-utils-3
     for vkd3dfiles in $VKD3D_FILES ; do
-        try_copy_other_dll_to_pfx_64 "${WH_VULKAN_LIBDIR}/vkd3d-proton-$USE_VKD3D_VER/x64/$vkd3dfiles.dll"
-        if try_copy_other_dll_to_pfx_32 "${WH_VULKAN_LIBDIR}/vkd3d-proton-$USE_VKD3D_VER/x86/$vkd3dfiles.dll"
+        try_copy_other_dll_to_pfx_64 "${WH_VULKAN_LIBDIR}/${USE_VKD3D_VER}/x64/$vkd3dfiles.dll"
+        if try_copy_other_dll_to_pfx_32 "${WH_VULKAN_LIBDIR}/${USE_VKD3D_VER}/x86/$vkd3dfiles.dll"
         then var_winedlloverride_update "$vkd3dfiles=n"
         fi
     done
@@ -1105,6 +1111,11 @@ init_wineprefix () {
     export DRIVE_C="$WINEPREFIX/drive_c"
     export XUSER_PATH="$DRIVE_C/users/xuser"
 
+    if [[ -d "$XUSER_PATH" ]] \
+    && [[ ! -d "$DRIVE_C/users/$USER" ]]
+    then try_force_link_dir "$XUSER_PATH" "$DRIVE_C/users/$USER"
+    fi
+
     if [[ ! -f "$WINEPREFIX/.firstboot" ]] ; then
         create_new_dir "$WINEPREFIX"
         if [[ "$CLEAR_PREFIX" == "1" ]]
@@ -1350,8 +1361,6 @@ init_database () {
 }
 
 prepair_wine () {
-    var_winedlloverride_update "winemenubuilder.exe=d"
-
     if [[ -n "$INSTALL_SCRIPT_NAME" ]]
     then print_info "Используются настройки из скрипта установки: $INSTALL_SCRIPT_NAME"
     else init_database
@@ -1650,8 +1659,8 @@ select_wine_version() {
         read -p "Введите номер для выбора wine/proton (0-$max_choice): " user_choice
         if [[ "$user_choice" =~ ^[0-9]+$ ]] && (( user_choice >= 0 && user_choice <= max_choice )); then
             if [[ "$user_choice" == "0" ]]; then
-                print_info "Создание префикса отменено."
-                exit 0
+                print_info "Операция отменена."
+                return 1
             fi
             local selected_opt
             selected_opt="${selectable_options[$user_choice]}"
@@ -1665,6 +1674,7 @@ select_wine_version() {
             print_error "Неверный выбор. Введите число от 0 до $max_choice."
         fi
     done
+    return 0
 }
 
 create_prefix() {
@@ -1714,7 +1724,7 @@ create_prefix() {
         *) fatal "Неверный выбор. Операция отменена." ;;
     esac
 
-    select_wine_version
+    select_wine_version || exit 0
 
     print_info "Выберите тип создаваемого префикса:"
     echo " 0) Отмена создания префикса"
@@ -1808,9 +1818,9 @@ create_base_pfx () {
     && [[ ! -L "$users_dir/$USER" ]]
     then
         if [[ -L "$users_dir/xuser" ]]
-        then try_remove_dir "$users_dir/xuser/"
+        then try_remove_dir "$users_dir/xuser"
         fi
-        create_new_dir "$users_dir/xuser/"
+        create_new_dir "$users_dir/xuser"
         cp -fr "$users_dir/$USER"/* "$users_dir/xuser/"
     fi
 
@@ -2011,6 +2021,198 @@ restore_prefix() {
     return 0
 }
 
+update_last_conf_var() {
+    local var_name="$1"
+    local new_value="$2"
+    local conf_file="$WINEPREFIX/last.conf"
+
+    if [[ ! -f "$conf_file" ]] ; then
+        print_warning "Файл last.conf не найден, не могу обновить переменную $var_name."
+        return 1
+    fi
+
+    if grep -q "export $var_name=" "$conf_file"; then
+        sed -i "s|^export $var_name=.*|export $var_name=\"$new_value\"|" "$conf_file"
+    else
+        echo "export $var_name=\"$new_value\"" >> "$conf_file"
+    fi
+}
+
+list_component_versions() {
+    local component_group="$1"
+    local sha256_file="$DATA_PATH/sha256sum.list"
+    [[ ! -f "$sha256_file" ]] && fatal "Файл с версиями не найден: $sha256_file"
+
+    print_info "Доступные версии для $component_group:"
+
+    awk -v group="$component_group" '
+        /^#+\s*([^#]+?)\s*#*$/ {
+            current_group = $0
+            gsub(/^#+\s*|\s*#*$/, "", current_group)
+        }
+        /^[a-f0-9]{64}/ {
+            if (current_group == group) {
+                filename = $2
+                sub(/\.tar\.xz$/, "", filename)
+                print " - " filename
+            }
+        }
+    ' "$sha256_file" | sort -Vr
+}
+
+select_component_version() {
+    local component_group="$1"
+    local sha256_file="$DATA_PATH/sha256sum.list"
+    [[ ! -f "$sha256_file" ]] && fatal "Файл с версиями не найден: $sha256_file"
+
+    local versions=()
+    local current_group=""
+    while IFS= read -r line; do
+        if [[ "$line" =~ ^#+[[:space:]]([^#[:space:]]+)[[:space:]]#* ]] ; then
+            current_group="${BASH_REMATCH[1]}"
+        elif [[ "$current_group" == "$component_group" ]] && [[ "$line" =~ [a-f0-9]{64} ]] ; then
+            local filename
+            filename=$(echo "$line" | awk '{print $2}')
+            local version_name=${filename%.tar.xz}
+            versions+=("$version_name")
+        fi
+    done < "$sha256_file"
+
+    IFS=$'\n' versions=($(sort -Vr <<<"${versions[*]}"))
+    unset IFS
+
+    if [[ ${#versions[@]} -eq 0 ]] ; then
+        print_warning "Не найдено доступных версий для $component_group." >&2
+        return 1
+    fi
+
+    print_info "Выберите версию $component_group для установки:" >&2
+    echo >&2
+
+    local items_to_print=(" 0) Отмена")
+    for i in "${!versions[@]}" ; do
+        items_to_print+=(" $((i+1))) ${versions[$i]}")
+    done
+
+    local num_items=${#items_to_print[@]}
+    local term_width=${COLUMNS:-80}
+    local max_len=0
+    for item in "${items_to_print[@]}" ; do
+        (( ${#item} > max_len )) && max_len=${#item}
+    done
+
+    ((max_len+=2))
+    local num_cols=$(( term_width / max_len ))
+    (( num_cols = num_cols > 0 ? num_cols : 1 ))
+    local num_rows=$(( (num_items + num_cols - 1) / num_cols ))
+
+    for ((i=0; i<num_rows; i++)) ; do
+        for ((j=0; j<num_cols; j++)) ; do
+            local index=$(( i + j * num_rows ))
+            (( index < num_items )) && printf "%-*s" "$max_len" "${items_to_print[index]}" >&2
+        done
+        echo >&2
+    done
+
+    local max_choice=${#versions[@]}
+    local user_choice
+    while true; do
+        echo >&2
+        read -p "Введите номер (0-$max_choice): " user_choice
+        if [[ "$user_choice" =~ ^[0-9]+$ ]] && (( user_choice >= 0 && user_choice <= max_choice )) ; then
+            if [[ "$user_choice" == "0" ]] ; then
+                return 1
+            fi
+            echo "${versions[$((user_choice-1))]}"
+            return 0
+        else
+            print_error "Неверный выбор. Введите число от 0 до $max_choice." >&2
+        fi
+    done
+}
+
+run_install_to_prefix() {
+    export WINEPREFIX="$1"
+    local WIN_FILE_EXEC="$2"
+
+    if [[ -z "$WINEPREFIX" ]] || [[ -z "$WIN_FILE_EXEC" ]]; then
+        fatal "Использование: $SCRIPT_NAME install-to-prefix <имя_префикса> <путь_к_установщику>"
+    fi
+
+    check_prefix_var
+    prepair_wine
+    wine_run_install "$WIN_FILE_EXEC"
+}
+
+run_install_dxvk() {
+    local version="$1"
+    if [[ -z "$version" ]] ; then
+        version=$(select_component_version "DXVK")
+        [[ $? -ne 0 ]] && print_info "Установка DXVK отменена." && return
+    elif [[ "$version" == "list" ]]; then
+        list_component_versions "DXVK"
+        return
+    fi
+    check_prefix_var
+    init_database
+    init_wine_ver
+    init_wineprefix
+    if [[ "$version" == "none" ]] ; then
+        print_info "Удаление DXVK..."
+        init_wined3d
+        update_last_conf_var "DXVK_VER" ""
+    else
+        init_dxvk "$version"
+        update_last_conf_var "DXVK_VER" "$USE_DXVK_VER"
+    fi
+    wait_wineserver
+}
+
+run_install_vkd3d() {
+    local version="$1"
+    if [[ -z "$version" ]] ; then
+        version=$(select_component_version "VKD3D")
+        [[ $? -ne 0 ]] && print_info "Установка VKD3D отменена." && return
+    elif [[ "$version" == "list" ]] ; then
+        list_component_versions "VKD3D"
+        return
+    fi
+    check_prefix_var
+    init_database
+    init_wine_ver
+    init_wineprefix
+    if [[ "$version" == "none" ]] ; then
+        print_info "Удаление VKD3D..."
+        init_wined3d
+        update_last_conf_var "VKD3D_VER" ""
+    else
+        init_vkd3d "$version"
+        update_last_conf_var "VKD3D_VER" "$USE_VKD3D_VER"
+    fi
+    wait_wineserver
+}
+
+run_change_wine_version() {
+    local new_version="$1"
+
+    check_prefix_var
+    init_database
+
+    if [[ -z "$new_version" ]]; then
+        select_wine_version || exit 0
+        new_version="$WH_WINE_USE"
+    else
+        export WH_WINE_USE="$new_version"
+    fi
+
+    init_wine_ver
+
+    init_wineprefix
+
+    wait_wineserver
+    print_ok "Версия Wine для префикса $PREFIX_NAME успешно изменена на $WH_WINE_USE."
+}
+
 wh_info () {
     echo "Использование: $SCRIPT_NAME [команда]
 
@@ -2019,6 +2221,10 @@ wh_info () {
     install [скрипт]                запустить скрипт установки программы
     install [скрипт] --clear-pfx    не использовать готовый префикс для установки ПО
 
+    install-dxvk [версия|none|list] установить, удалить или показать версии DXVK
+    install-vkd3d [версия|none|list] установить, удалить или показать версии VKD3D
+    change-wine [версия]            изменить версию Wine/Proton для текущего префикса
+
     installed                       список установленных программ
     run [программа]                 запуск программы (отладка)
     remove-all                      удалить WineHelper и все связанные данные
@@ -2054,6 +2260,10 @@ else
     arg1="--help"
 fi
 
+# отключаем создание .desktop файлов средствами wine
+# и отключаем winebth, так как может сломать winedevice.exe
+var_winedlloverride_update "winemenubuilder.exe,winebth.sys=d"
+
 case "$arg1" in
     --version|version) rpm -qi "$SCRIPT_NAME" ; exit 0 ;;
     --help|help) wh_info ; exit 0 ;;
@@ -2066,6 +2276,10 @@ case "$arg1" in
     winetricks) prepair_wine ; "$WH_WINETRICKS" -q "$@" ;;
     desktop) create_desktop "$@" ; exit 0 ;;
     install|-i) run_autoinstall "$@" ;;
+    install-to-prefix) run_install_to_prefix "$@" ;;
+    install-dxvk) run_install_dxvk "$@" ;;
+    install-vkd3d) run_install_vkd3d "$@" ;;
+    change-wine) run_change_wine_version "$@" ;;
     installed) check_installed_programs "$1" ;;
     run|-r) run_installed_programs "$1" ;;
     backup-prefix) backup_prefix "$@" ;;

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