Compare commits

...
21 Commits
Author SHA1 Message Date
Mikhail Tergoev 33ffa28d60 remove unused versions of wine 2026-05-19 15:45:17 +03:00
Mikhail Tergoev e1bbdebfdd olimp: fix help windows 2026-05-19 15:42:16 +03:00
Mikhail Tergoev a1ae2c125d ctm-service: fix name exe for desktop file 2026-05-19 15:10:41 +03:00
Mikhail Tergoev 4b8f94a9cc one prefix for all t-flex and update wine 2026-05-19 00:21:31 +03:00
Mikhail Tergoev db7201f279 add new wine 11.9 (amd64, wow64 and tflex) 2026-05-18 21:37:36 +03:00
Mikhail Tergoev bfe9a3dc91 add check mangohud command 2026-05-15 14:10:31 +03:00
Mikhail Tergoev af2db32352 drop variable: WINE_TOP_WINDOW 2026-05-15 13:53:18 +03:00
Mikhail Tergoev c04b2df049 fix use UPDATE_CPCSP_PROXY from whdb 2026-05-14 17:45:06 +03:00
Mikhail Tergoev e8e068ba3b add variable: WINEDATADIR 2026-05-14 16:55:41 +03:00
Mikhail Tergoev 32ac86ed51 Merge branch 'minergenon-devel' 2026-05-14 16:43:58 +03:00
Sergey Palcheh e33d4037b1 gui: fix QProcess destruction while wine utilities still running 2026-05-14 18:42:05 +06:00
Sergey Palcheh c5cfe30877 gui: running Wine utilities via winehelper (CLI) instead of calling wine directly 2026-05-14 10:09:53 +06:00
Sergey Palcheh b8bd9cd08d added minimal creation .whdb file when manually creating a shortcut 2026-05-13 20:53:09 +06:00
Sergey Palcheh d942cb64c9 gui: hide installed app shortcut if .exe file is missing 2026-05-13 18:05:15 +06:00
Mikhail Tergoev f934d1e705 olimp: fix window focus 2026-05-07 21:15:16 +03:00
Mikhail Tergoev 00c16261a4 Merge branch 'minergenon-devel' 2026-05-07 20:00:35 +03:00
Mikhail Tergoev 9629717ada remove space from StartupWMClass 2026-05-07 20:00:03 +03:00
Sergey Palcheh 6fa71ed871 fix (gui): filter 'export' and '#' from winetricks list output 2026-05-06 14:45:20 +06:00
Mikhail Tergoev ab6629dd9a tflex: new wine with fix 3D and black popup on wayland 2026-05-04 21:04:18 +03:00
Mikhail Tergoev e90c365010 Merge branch 'minergenon-devel' 2026-04-29 22:12:57 +03:00
Sergey Palcheh 4e3ab5fba0 gui: winehelper is used to launch winetricks in the component dialog 2026-04-29 23:35:30 +06:00
27 changed files with 199 additions and 113 deletions

No files matched your search

+1 -1
View File
@@ -27,7 +27,7 @@ if try_download "https://files.ctm.ru/CSERVICE/SFX/setup_cs.exe" "${AUTOINSTALL_
wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\CSERVICE" /auto /hide
try_remove_dir "$AUTOINSTALL_UNPACK"
WIN_FILE_EXEC="$DRIVE_C/Program Files/CTM/CSERVICE/ctmservc.exe"
WIN_FILE_EXEC="$DRIVE_C/Program Files/CTM/CSERVICE/CService32.exe"
create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
if [[ "$USE_CTMBAR" == "1" ]] ; then
+2 -3
View File
@@ -4,14 +4,13 @@
export PROG_URL="https://www.tflexcad.ru"
export PROG_NAME="T-FLEX CAD Учебная Версия 17"
export PROG_ICON="tflexcad17"
export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
export WH_WINE_USE="wine-10.9-tflex-wow64"
export BASE_PFX="tflex_pfx_x64_v03"
export WINEARCH="win64"
export WH_WINDOWS_VER="10"
export WINEPREFIX="tflex17"
export WINEPREFIX="tflex"
export WH_XDG_OPEN="log"
export WH_USE_MESA_GL_OVERRIDE="1"
export WINE_D3D_CONFIG="renderer=vulkan"
# используем общий whdb файл для подготовки префикса и сервисов
# prepair_wine используется из файла настроек
+2 -3
View File
@@ -4,14 +4,13 @@
export PROG_URL="https://www.tflexcad.ru"
export PROG_NAME="T-FLEX CAD 17"
export PROG_ICON="tflexcad17"
export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
export WH_WINE_USE="wine-10.9-tflex-wow64"
export BASE_PFX="tflex_pfx_x64_v03"
export WINEARCH="win64"
export WH_WINDOWS_VER="10"
export WINEPREFIX="tflex17"
export WINEPREFIX="tflex"
export WH_XDG_OPEN="log"
export WH_USE_MESA_GL_OVERRIDE="1"
export WINE_D3D_CONFIG="renderer=vulkan"
# используем общий whdb файл для подготовки префикса и сервисов
# prepair_wine используется из файла настроек
+2 -3
View File
@@ -5,13 +5,12 @@ export PROG_URL="https://www.tflexcad.ru"
export PROG_NAME="Приложения для T-FLEX CAD 17"
export PROG_ICON="tflexcad17"
export WH_WINDOWS_VER="10"
export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
export WH_WINE_USE="wine-10.9-tflex-wow64"
export BASE_PFX="tflex_pfx_x64_v03"
export WINEARCH="win64"
export WINEPREFIX="tflex17"
export WINEPREFIX="tflex"
export WH_XDG_OPEN="log"
export WH_USE_MESA_GL_OVERRIDE="1"
export WINE_D3D_CONFIG="renderer=vulkan"
check_prefix_var
if [[ ! -f "$WINEPREFIX/drive_c/Program Files/T-FLEX CAD 17/Program/TFlexCad.exe" ]]
+2 -3
View File
@@ -5,13 +5,12 @@ export PROG_URL="https://www.tflexcad.ru"
export PROG_NAME="Ресурсы для T-FLEX CAD 17"
export PROG_ICON="tflexcad17"
export WH_WINDOWS_VER="10"
export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
export WH_WINE_USE="wine-10.9-tflex-wow64"
export BASE_PFX="tflex_pfx_x64_v03"
export WINEARCH="win64"
export WINEPREFIX="tflex17"
export WINEPREFIX="tflex"
export WH_XDG_OPEN="log"
export WH_USE_MESA_GL_OVERRIDE="1"
export WINE_D3D_CONFIG="renderer=vulkan"
check_prefix_var
if [[ ! -f "$WINEPREFIX/drive_c/Program Files/T-FLEX CAD 17/Program/TFlexCad.exe" ]]
+2 -3
View File
@@ -4,14 +4,13 @@
export PROG_URL="https://www.tflexcad.ru"
export PROG_NAME="T-FLEX CAD 18"
export PROG_ICON="tflexcad18"
export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
export WH_WINE_USE="wine-10.9-tflex-wow64"
export BASE_PFX="tflex_pfx_x64_v03"
export WINEARCH="win64"
export WH_WINDOWS_VER="10"
export WINEPREFIX="tflex18"
export WINEPREFIX="tflex"
export WH_XDG_OPEN="log"
export WH_USE_MESA_GL_OVERRIDE="1"
export WINE_D3D_CONFIG="renderer=vulkan"
# используем общий whdb файл для подготовки префикса и сервисов
# prepair_wine используется из файла настроек
+2 -3
View File
@@ -5,13 +5,12 @@ export PROG_URL="https://www.tflexcad.ru"
export PROG_NAME="Приложения для T-FLEX CAD 18"
export PROG_ICON="tflexcad18"
export WH_WINDOWS_VER="10"
export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
export WH_WINE_USE="wine-10.9-tflex-wow64"
export BASE_PFX="tflex_pfx_x64_v03"
export WINEARCH="win64"
export WINEPREFIX="tflex18"
export WINEPREFIX="tflex"
export WH_XDG_OPEN="log"
export WH_USE_MESA_GL_OVERRIDE="1"
export WINE_D3D_CONFIG="renderer=vulkan"
check_prefix_var
if [[ ! -f "$WINEPREFIX/drive_c/Program Files/T-FLEX CAD 18/Program/TFlexCad.exe" ]]
+2 -3
View File
@@ -5,13 +5,12 @@ export PROG_URL="https://www.tflexcad.ru"
export PROG_NAME="Ресурсы для T-FLEX CAD 18"
export PROG_ICON="tflexcad18"
export WH_WINDOWS_VER="10"
export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
export WH_WINE_USE="wine-10.9-tflex-wow64"
export BASE_PFX="tflex_pfx_x64_v03"
export WINEARCH="win64"
export WINEPREFIX="tflex18"
export WINEPREFIX="tflex"
export WH_XDG_OPEN="log"
export WH_USE_MESA_GL_OVERRIDE="1"
export WINE_D3D_CONFIG="renderer=vulkan"
check_prefix_var
if [[ ! -f "$WINEPREFIX/drive_c/Program Files/T-FLEX CAD 18/Program/TFlexCad.exe" ]]
+2 -3
View File
@@ -4,14 +4,13 @@
export PROG_URL="https://www.tflexcad.ru"
export PROG_NAME="T-FLEX CAD 2D+ 17"
export PROG_ICON="tflexcad17"
export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
export WH_WINE_USE="wine-10.9-tflex-wow64"
export BASE_PFX="tflex_pfx_x64_v03"
export WINEARCH="win64"
export WH_WINDOWS_VER="10"
export WINEPREFIX="tflex17"
export WINEPREFIX="tflex"
export WH_XDG_OPEN="log"
export WH_USE_MESA_GL_OVERRIDE="1"
export WINE_D3D_CONFIG="renderer=vulkan"
# используем общий whdb файл для подготовки префикса и сервисов
# prepair_wine используется из файла настроек
+2 -3
View File
@@ -4,14 +4,13 @@
export PROG_URL="https://www.tflexcad.ru"
export PROG_NAME="T-FLEX CAD 2D+ 18"
export PROG_ICON="tflexcad18"
export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
export WH_WINE_USE="wine-10.9-tflex-wow64"
export BASE_PFX="tflex_pfx_x64_v03"
export WINEARCH="win64"
export WH_WINDOWS_VER="10"
export WINEPREFIX="tflex18"
export WINEPREFIX="tflex"
export WH_XDG_OPEN="log"
export WH_USE_MESA_GL_OVERRIDE="1"
export WINE_D3D_CONFIG="renderer=vulkan"
# используем общий whdb файл для подготовки префикса и сервисов
# prepair_wine используется из файла настроек
+2 -3
View File
@@ -4,14 +4,13 @@
export PROG_URL="https://www.tflexcad.ru"
export PROG_NAME="T-FLEX DOCs 17"
export PROG_ICON="tflexdoc17"
export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
export WH_WINE_USE="wine-10.9-tflex-wow64"
export BASE_PFX="tflex_pfx_x64_v03"
export WINEARCH="win64"
export WH_WINDOWS_VER="10"
export WINEPREFIX="tflex17"
export WINEPREFIX="tflex"
export WH_XDG_OPEN="log"
export WH_USE_MESA_GL_OVERRIDE="1"
export WINE_D3D_CONFIG="renderer=gdi"
# используем общий whdb файл для подготовки префикса и сервисов
# prepair_wine используется из файла настроек
+2 -3
View File
@@ -4,14 +4,13 @@
export PROG_URL="https://www.tflexcad.ru"
export PROG_NAME="T-FLEX Viewer 17"
export PROG_ICON="tflexcad17"
export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
export WH_WINE_USE="wine-10.9-tflex-wow64"
export BASE_PFX="tflex_pfx_x64_v03"
export WINEARCH="win64"
export WH_WINDOWS_VER="10"
export WINEPREFIX="tflex17"
export WINEPREFIX="tflex"
export WH_XDG_OPEN="log"
export WH_USE_MESA_GL_OVERRIDE="1"
export WINE_D3D_CONFIG="renderer=vulkan"
# используем общий whdb файл для подготовки префикса и сервисов
# prepair_wine используется из файла настроек
+2 -3
View File
@@ -4,14 +4,13 @@
export PROG_URL="https://www.tflexcad.ru"
export PROG_NAME="T-FLEX Viewer 18"
export PROG_ICON="tflexcad18"
export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
export WH_WINE_USE="wine-10.9-tflex-wow64"
export BASE_PFX="tflex_pfx_x64_v03"
export WINEARCH="win64"
export WH_WINDOWS_VER="10"
export WINEPREFIX="tflex18"
export WINEPREFIX="tflex"
export WH_XDG_OPEN="log"
export WH_USE_MESA_GL_OVERRIDE="1"
export WINE_D3D_CONFIG="renderer=vulkan"
# используем общий whdb файл для подготовки префикса и сервисов
# prepair_wine используется из файла настроек
+1 -1
View File
@@ -2,7 +2,7 @@
# info_ru: Компоненты сервисов поддержки T-FLEX 17 и 18
########################################################################
export WH_WINDOWS_VER="10"
export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
export WH_WINE_USE="wine-10.9-tflex-wow64"
export BASE_PFX="tflex_pfx_x64_v03"
export WINEARCH="win64"
export PROG_VERSION=""
+1 -1
View File
@@ -2,7 +2,7 @@
# 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 WH_WINE_USE="wine-10.0-tkg-amd64"
export WINEPREFIX="nettest"
export PROG_NAME="NetTest"
export BASE_PFX="none"
+3 -3
View File
@@ -2,13 +2,13 @@
# info_ru: "КИС Олимп" - программно-аналитический комплекс, состоящий из самостоятельных подключаемых модулей.
########################################################################
export PROG_URL="https://olimp.best/"
export WH_WINE_USE="wine-10.18.1-alt2-i586"
export WH_WINE_USE="wine-10.0-tkg-i586"
export WINEPREFIX="olimp"
export PROG_NAME="КИС Олимп"
export BASE_PFX="olimp_pfx_x86_v02"
export BASE_PFX="olimp_pfx_x86_v03"
export WINEARCH="win32"
export WH_WINDOWS_VER="7"
export INSTALL_DLL="jet40 dotnet45 corefonts lucida opensymbol tahoma cjkfonts mdac28 msxml4 native_oleaut32 vcrun2005"
export INSTALL_DLL="jet40 dotnet45 corefonts lucida opensymbol tahoma cjkfonts mdac28 msxml4 native_oleaut32 vcrun2005 ie8"
export WINEDLLOVERRIDES="d2d1=n"
export WH_MAIN_DECORATED="0"
export FREETYPE_PROPERTIES="truetype:interpreter-version=35"
+1 -1
View File
@@ -7,7 +7,7 @@ export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
export BASE_PFX="tflex_pfx_x64_v03"
export WINEARCH="win64"
export WH_WINDOWS_VER="10"
export WINEPREFIX="tflex17"
export WINEPREFIX="tflex"
export WH_XDG_OPEN="log"
export WH_USE_MESA_GL_OVERRIDE="1"
export WINE_D3D_CONFIG="renderer=vulkan"
+1 -1
View File
@@ -7,7 +7,7 @@ export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
export BASE_PFX="tflex_pfx_x64_v03"
export WINEARCH="win64"
export WH_WINDOWS_VER="10"
export WINEPREFIX="tflex18"
export WINEPREFIX="tflex"
export WH_XDG_OPEN="log"
export WH_USE_MESA_GL_OVERRIDE="1"
+1 -1
View File
@@ -7,7 +7,7 @@ export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
export BASE_PFX="tflex_pfx_x64_v03"
export WINEARCH="win64"
export WH_WINDOWS_VER="10"
export WINEPREFIX="tflex17"
export WINEPREFIX="tflex"
export WH_XDG_OPEN="log"
export WH_USE_MESA_GL_OVERRIDE="1"
export WINE_D3D_CONFIG="renderer=gdi"
+8 -15
View File
@@ -1,26 +1,19 @@
##### WINE WOW64 #####
7f3b22aeb72b96f1c1c33c5d4cf108a56b8aacea461e23d511e1064bcf448caa wine-11.9-tkg-wow64.tar.xz
8b9a6548eb5df921514cd569607e7f845acd18a3a6cf56f1f724b38bc9a94e43 wine-11.6.1-scadoffice-alt5-wow64.tar.xz
a176e2ee3d60f691538b3c463047ff5eabd0ba2e37c0158783d79e9fa68caa2f wine-11.4.1-emias-alt2-wow64.tar.xz
3c7c394658ad993968532e20ae9b591c1a0ec5b7495c8450de09bd4f8947462e wine-11.3.1-alt1-wow64.tar.xz
349c707148a23e667970309248bbbf97b4e2a0db59c548e73d9fe9c3f585872c wine-10.18.1-alt1-wow64.tar.xz
a862761c432f8619caf8100589678a1cbb523787259120ccd4388089d81e3b17 wine-10.18.1-tflex-alt2-wow64.tar.xz
e9a8b79dfe12cad1304dca573d73aefe109e3d69b6fff739c8dbb8b2d3c271c6 wine-10.12.1-alt1-wow64.tar.xz
a83a665b3cc58ec4e242df5ab381c87d3e32a658ee507514b6590e6c73474929 wine-10.9-tflex-wow64.tar.xz
eab43cb4ef6c69ef8c4c8af9e1afadb83141d4d6b0d51afb69fc47596776ecc2 wine-10.0-tkg-wow64.tar.xz
##### WINE AMD64 #####
009c95bfe2df3f9264c9c5092f3e30ea7a168dd7869046058a718a70739602d4 wine_wh_tflex_10-9_amd64.tar.xz
71d6fdfd23d7988471d345c68e81699b8af931352b03dd216424b398f63c7b12 wine_x_tkg_10-0_amd64.tar.xz
e0a84bb4908c3927954d7eef6b8ac7212e442b8c107d000c6890fec340f96183 wine-9.0.14-alt1-amd64.tar.xz
bb1e67282255eb1a927834082d0ef8f6900c76d598e7d6453250000cf2f1218a wine-11.9-tkg-amd64.tar.xz
bcd2f4f5d5f61da73352c6f4ca900e86eb93d80cdd28668be07d7c80c34e3501 wine-10.0-tkg-amd64.tar.xz
fd209c95a3aa507002374417365b3d1119dbe3a0a6d223034171221a2b187b66 wine-9.0-cx-amd64.tar.xz
f1bf1261550ca2928cefacdb724926d3d6d103433d0ff6882ee9783a50d8f4e4 wine-8.8-staging-amd64.tar.xz
61bec1230b37b8fcc69fd45f848b44fd88cc41fcdd5dc3080336d7da63660f40 wine-7.16.1-alt1-amd64.tar.xz
##### WINE I586 #####
1385323e059c376299a83088ada85e625c170337ba07e5307df75961726d8eee wine-10.18.1-alt2-i586.tar.xz
49ce3e1152f01c1f24ca148092a66f6eccd68cf4ee35d0cb04900120f45dd864 wine-10.12.1-alt1-i586.tar.xz
3571c40a787f0386e0160b5d471b1bf11fa2a235b497156cd38198b90bcb4a9f wine_x_tkg_10-0_i586.tar.xz
fb7fdfde96de10a1b3b051bdf2727b6a7c1768b878483726454dd6726e9e0193 wine-9.0.14-alt1-i586-spravkibk.tar.xz
6f86d2220b65b709bf88c6f829a4998de3b929cc2091cd1333a51c32e1491b79 wine-9.0.9-alt1-i586.tar.xz
6fea17fd131f57c2ebf7ca4c60d3c5a9e819afe16e5d0b77ecb750da99ae0e38 wine-7.16.1-alt1-i586.tar.xz
6e4346f7d2631c1f6859eb46c428fba84c6e61063c5f622e11a83ad59e5b00db wine-10.0-tkg-i586.tar.xz
##### DXVK #####
98411effbc1b3611b11c4ca3af2ad29400b08e1c8c380791d6351600a06fb3c7 dxvk-1.10.3-28.tar.xz
@@ -216,9 +209,9 @@ d16c300b5451e4fad6eeebeca0949367a7bdf1cb1878fc51f0f9dee33744d3a7 emias_pfx_x64_
# create with wine-10.18.1-alt1-wow64 (universal user: xuser)
# winetricks crypt32
cf7f6284fc46d9a0be9756721d04e9f8842a481f805829711d4340fed5e67e69 olimp_pfx_x86_v02.tar.xz
504e463e92eae8ff079512db415477fe5f3147ac930327e2056098abbf18100c olimp_pfx_x86_v03.tar.xz
# create with wine-10.18.1-alt2-i586
# winetricks jet40 dotnet45 corefonts lucida opensymbol tahoma cjkfonts mdac28 msxml4 native_oleaut32 vcrun2005
# winetricks jet40 dotnet45 corefonts lucida opensymbol tahoma cjkfonts mdac28 msxml4 native_oleaut32 vcrun2005 ie8
# + psqlodbc_x86.msi installed from script
4fc8ba95190d7d2cd05f60f29fe6af801f99bf046ab75bccd82bf48a600d5fc4 scadoffice_pfx_x64_v06.tar.xz
+1 -1
View File
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# info_ru: Программный комплекс для энергетики.
########################################################################
export WH_WINE_USE="wine-9.0.14-alt1-amd64"
export WH_WINE_USE="wine-10.0-tkg-amd64"
export WINEPREFIX="swmanmodus"
export BASE_PFX="none"
export WH_WINDOWS_VER="10"
+1 -1
View File
@@ -2,7 +2,7 @@
# info_ru: ZuluGIS 2021 Инженерные расчёты (Полный) 64-бит. Включает ZuluGIS, пакеты расчетов ZuluThermo, ZuluHydro, ZuluDrain, ZuluGaz, ZuluSteam, библиотеки ZuluXTools и ZuluNetTools. Дополнительно в состав пакета входит Microsoft SQL Server Express LocalDB 2012.
########################################################################
export PROG_URL="https://www.politerm.com"
export WH_WINE_USE="wine_x_tkg_10-0_amd64"
export WH_WINE_USE="wine-10.0-tkg-amd64"
export PROG_NAME="ZuluGIS 2021"
export WINEPREFIX="zulugis"
export PROG_ICON="zulugis"
+43 -18
View File
@@ -648,6 +648,8 @@ create_desktop () {
# Создаем .desktop файл
create_new_dir "$WH_MENU_DIR"
local startup_wm_class
startup_wm_class="$(basename "$exe_file" | sed 's/ //g')"
{
echo "[Desktop Entry]"
echo "Name=$name_desktop"
@@ -655,9 +657,10 @@ create_desktop () {
echo "Type=Application"
echo "Categories=WineHelper;"
echo "StartupNotify=true"
echo "Terminal=false"
echo "Path=$DATA_PATH"
echo "Icon=$icon_file"
echo "StartupWMClass=$(basename "$exe_file")"
echo "StartupWMClass=${startup_wm_class}"
} > "$USER_WORK_PATH/$desktop_filename.desktop"
chmod +x "$USER_WORK_PATH/$desktop_filename.desktop"
@@ -729,22 +732,36 @@ EOF
print_info "В меню создан ярлык: $desktop_filename.desktop"
fi
if [[ -n "$INSTALL_SCRIPT_NAME" ]] \
&& [[ -f "$exe_file" ]]
then
{
echo '#!/usr/bin/env bash'
echo "# cmd_name: $INSTALL_SCRIPT_NAME"
} > "$exe_file".whdb
if [[ -f "$exe_file" ]] ; then
if [[ -n "$INSTALL_SCRIPT_NAME" ]] && [[ -f "$INSTALL_SCRIPT" ]] ; then
{
echo '#!/usr/bin/env bash'
echo "# cmd_name: $INSTALL_SCRIPT_NAME"
} > "$exe_file".whdb
grep -e "info_" -e "#####" -e "PROG_URL=" -e "WINEPREFIX=" -e "INSTALL_DLL=" \
-e "PROG_NAME=" -e "PROG_ICON=" -e "var_" -e "WH_MAIN_DECORATED" \
-e "WH_VIRTUAL_DESKTOP" -e "WINE_TOP_WINDOW" -e "WH_FONT_SMOOTHING "\
-e "WH_FONT_MSS_REPLACE" -e "FREETYPE_PROPERTIES" -e "WINE_D3D_CONFIG" \
-e "WH_USE_MESA_GL_OVERRIDE" -e "WINEDLLOVERRIDES" \
"$INSTALL_SCRIPT" | awk '{$1=$1;print}' >> "$exe_file".whdb
grep -e "info_" -e "#####" -e "PROG_URL=" \
-e "WINEPREFIX=" -e "INSTALL_DLL=" \
-e "PROG_NAME=" -e "PROG_ICON=" -e "var_" \
-e "WINEDLLOVERRIDES" -e "WH_MAIN_DECORATED" \
-e "WH_VIRTUAL_DESKTOP" -e "WH_FONT_SMOOTHING" \
-e "WH_FONT_MSS_REPLACE" -e "FREETYPE_PROPERTIES" \
-e "WINE_D3D_CONFIG" -e "WH_USE_MESA_GL_OVERRIDE" \
"$INSTALL_SCRIPT" | awk '{$1=$1;print}' >> "$exe_file".whdb
print_info "Создан файл настроек для $exe_file"
print_info "Создан файл настроек для $exe_file"
elif [[ ! -f "$exe_file".whdb ]] ; then
# Создаем минимальный .whdb файл при ручном создании ярлыка
local prefix_name
prefix_name="$(basename "$WINEPREFIX")"
cat > "$exe_file".whdb <<EOF
#!/usr/bin/env bash
# info_ru: $name_desktop
########################################################################
PROG_NAME="$name_desktop"
WINEPREFIX="$prefix_name"
EOF
print_info "Создан минимальный файл настроек для $exe_file"
fi
fi
}
@@ -1026,7 +1043,7 @@ init_wine_ver () {
fi
if [[ $WH_USE_CPCSP_PROXY == "1" ]] ; then
unset UPDATE_CPCSP_PROXY
check_variables "UPDATE_CPCSP_PROXY" "0"
local cpcsp_proxy_ver
if [[ $WH_WINE_WOW64 == "1" ]]
then cpcsp_proxy_ver="$CPCSP_PROXY_WOW64_VER"
@@ -1072,6 +1089,7 @@ init_wine_ver () {
export WINE="$WINEDIR/bin/wine"
export WINELOADER="$WINEDIR/bin/wine"
export WINESERVER="$WINEDIR/bin/wineserver"
export WINEDATADIR="$WINEDIR/share/wine"
if [[ -n "${PATH}" ]]
then export PATH="$WINEDIR/bin:${PATH}"
@@ -1668,7 +1686,13 @@ prepair_wine () {
init_dxvk "$DXVK_VER"
init_vkd3d "$VKD3D_VER"
[[ "$MANGOHUD" == 1 ]] && MANGOHUD_RUN="mangohud"
if [[ "$MANGOHUD" == 1 ]] ; then
if command -v mangohud &>/dev/null ; then
MANGOHUD_RUN="mangohud"
else
print_error "mangohud не найден в системе"
fi
fi
}
wine_regfile () {
@@ -1688,7 +1712,7 @@ wine_regfile () {
wine_run () {
local wh_add_args win_file_exec win_file_path win_file_name
if [[ $1 =~ (winecfg|regedit|winefile|wineconsole|control) ]] ; then
if [[ $1 =~ (winecfg|regedit|winefile|wineconsole|control|uninstaller) ]] ; then
win_file_exec="$1"
win_file_name="$win_file_exec"
win_file_path="$DRIVE_C"
@@ -2835,6 +2859,7 @@ case "$arg1" in
winefile|explorer) prepair_wine ; wine_run "winefile" ;;
wineconsole|cmd) prepair_wine ; wine_run "wineconsole" ;;
control) prepair_wine ; wine_run "control" ;;
uninstaller) prepair_wine ; wine_run "uninstaller" ;;
winetricks) prepair_wine ; "$WH_WINETRICKS" -q "$@" ;;
desktop) create_desktop "$@" ; exit 0 ;;
install|-i) run_autoinstall "$@" ;;
+60 -23
View File
@@ -102,6 +102,7 @@ class WineHelperGUI(QMainWindow):
self.install_process = None
self.current_display_name = None
self.install_dialog = None
self._wine_util_processes = [] # Активные процессы Wine-утилит
# Состояние UI
self.selected_app_button = None # Текущая выбранная кнопка приложения
@@ -2215,7 +2216,7 @@ class WineHelperGUI(QMainWindow):
winetricks_path = EnvironmentConfig.WH_WINETRICKS
wine_executable = self._get_wine_executable_for_prefix(prefix_name)
dialog = WinetricksManagerDialog(prefix_path, winetricks_path, self, wine_executable=wine_executable)
dialog = WinetricksManagerDialog(prefix_path, winetricks_path, self, wine_executable=wine_executable, winehelper_path=self.winehelper_path)
dialog.installation_complete.connect(lambda: self.update_prefix_info_display(prefix_name))
dialog.exec_()
@@ -2352,7 +2353,7 @@ class WineHelperGUI(QMainWindow):
return None
def _run_wine_util(self, util_name, prefix_name=None):
"""Запускает стандартную утилиту Wine для выбранного префикса."""
"""Запускает стандартную утилиту Wine для выбранного префикса через winehelper (CLI)."""
if not prefix_name:
prefix_name = self._get_prefix_name_for_selected_app()
@@ -2366,30 +2367,45 @@ class WineHelperGUI(QMainWindow):
QMessageBox.critical(self, "Ошибка", f"Каталог префикса не найден:\n{prefix_path}")
return
wine_executable = self._get_wine_executable_for_prefix(prefix_name)
# Сопоставление имен утилит GUI с командами CLI winehelper
cli_command_map = {
'winecfg': 'winecfg',
'regedit': 'winereg',
'winefile': 'winefile',
'control': 'control',
'cmd': 'wineconsole',
'uninstaller': 'uninstaller',
}
env = os.environ.copy()
env["WINEPREFIX"] = prefix_path
# 'wine cmd' - особый случай, требует запуска в терминале
if util_name == 'cmd':
terminal_command = f"env WINEPREFIX='{prefix_path}' {shlex.quote(wine_executable)} cmd"
try:
# x-terminal-emulator - стандартный способ вызова терминала по умолчанию
subprocess.Popen(['x-terminal-emulator', '-e', terminal_command])
except FileNotFoundError:
QMessageBox.critical(self, "Ошибка", "Не удалось найти `x-terminal-emulator`.\nУбедитесь, что у вас установлен терминал по умолчанию (например, mate-terminal или xterm).")
except Exception as e:
QMessageBox.critical(self, "Ошибка", f"Не удалось запустить терминал: {e}")
cli_command = cli_command_map.get(util_name)
if not cli_command:
QMessageBox.critical(self, "Ошибка", f"Неизвестная утилита Wine: {util_name}")
return
# Для остальных утилит
command = [wine_executable, util_name]
try:
subprocess.Popen(command, env=env)
except Exception as e:
# Для всех утилит запускаем через winehelper с правильным окружением
env = QProcessEnvironment.systemEnvironment()
env.insert("WINEPREFIX", prefix_path)
process = QProcess()
process.setProcessEnvironment(env)
process.setProcessChannelMode(QProcess.MergedChannels)
process.finished.connect(lambda: self._cleanup_wine_util_process(process))
process.errorOccurred.connect(lambda: self._cleanup_wine_util_process(process))
self._wine_util_processes.append(process)
args = [cli_command]
process.start(self.winehelper_path, args)
if not process.waitForStarted(5000):
QMessageBox.critical(self, "Ошибка запуска",
f"Не удалось запустить команду:\n{' '.join(command)}\n\nОшибка: {str(e)}")
f"Не удалось запустить утилиту {util_name} через winehelper.")
self._cleanup_wine_util_process(process)
def _cleanup_wine_util_process(self, process):
"""Удаляет завершенный процесс из списка активных Wine-утилит."""
if process in self._wine_util_processes:
self._wine_util_processes.remove(process)
def toggle_run_stop_app(self):
"""Запускает или останавливает выбранное приложение."""
@@ -2627,11 +2643,23 @@ class WineHelperGUI(QMainWindow):
self.command_process.terminate()
self.command_process.waitForFinished(3000)
# Завершаем все Wine-утилиты (winecfg, regedit и т.д.)
for process in list(self._wine_util_processes):
if process.state() == QProcess.Running:
process.kill()
process.waitForFinished(2000)
process.deleteLater()
self._wine_util_processes.clear()
QApplication.processEvents()
# Отключаем обработчики сигналов от всех запущенных процессов,
# так как мы собираемся их принудительно завершить и выйти.
# Это предотвращает ошибку RuntimeError при закрытии.
for process in running_apps.values():
process.finished.disconnect()
try:
process.finished.disconnect()
except TypeError:
pass
# Используем встроенную команду killall для надежного завершения всех процессов wine
self.append_log("Завершение всех запущенных приложений...")
@@ -2652,6 +2680,15 @@ class WineHelperGUI(QMainWindow):
self.command_process.terminate()
self.command_process.waitForFinished(3000)
# Завершаем все Wine-утилиты (winecfg, regedit и т.д.)
for process in list(self._wine_util_processes):
if process.state() == QProcess.Running:
process.kill()
process.waitForFinished(2000)
process.deleteLater()
self._wine_util_processes.clear()
QApplication.processEvents()
QApplication.instance().quit()
def uninstall_app(self):
+8 -8
View File
@@ -53,11 +53,12 @@ class WinetricksManagerDialog(QDialog):
installation_complete = pyqtSignal()
def __init__(self, prefix_path, winetricks_path, parent=None, wine_executable=None):
def __init__(self, prefix_path, winetricks_path, parent=None, wine_executable=None, winehelper_path=None):
super().__init__(parent)
self.prefix_path = prefix_path
self.winetricks_path = winetricks_path
self.wine_executable = wine_executable or 'wine'
self.winehelper_path = winehelper_path or 'winehelper'
self.initial_states = {}
self.apply_process = None
self.installation_finished = False
@@ -229,11 +230,10 @@ class WinetricksManagerDialog(QDialog):
env = QProcessEnvironment.systemEnvironment()
env.insert("WINEPREFIX", self.prefix_path)
env.insert("WINE", self.wine_executable)
process.setProcessEnvironment(env)
process.finished.connect(partial(self._on_load_finished, category))
process.start(self.winetricks_path, [category, "list"])
process.start(self.winehelper_path, ["winetricks", category, "list"])
def _parse_winetricks_log(self):
"""Читает winetricks.log и возвращает множество установленных компонентов."""
@@ -423,7 +423,7 @@ class WinetricksManagerDialog(QDialog):
# Устанавливает новые компоненты (без --force)
if verbs_to_install:
self._log(f"Выполнение установки: winetricks --unattended {' '.join(verbs_to_install)}")
self._log(f"Выполнение установки: winehelper winetricks {' '.join(verbs_to_install)}")
self._run_winetricks_process(verbs_to_install, use_force=False)
# Переустанавливает компоненты (с --force)
@@ -431,7 +431,7 @@ class WinetricksManagerDialog(QDialog):
if verbs_to_install:
# Если уже что-то устанавливается, добавляем небольшую задержку
self._log("\n---\n")
self._log(f"Выполнение переустановки: winetricks --unattended --force {' '.join(verbs_to_reinstall)}")
self._log(f"Выполнение переустановки: winehelper winetricks --force {' '.join(verbs_to_reinstall)}")
self._run_winetricks_process(verbs_to_reinstall, use_force=True)
def _run_winetricks_process(self, verbs, use_force=False):
@@ -441,7 +441,7 @@ class WinetricksManagerDialog(QDialog):
verbs: Список компонентов для установки
use_force: Использовать ли флаг --force
"""
args = ["--unattended"]
args = []
if use_force:
args.append("--force")
args.extend(verbs)
@@ -449,9 +449,9 @@ class WinetricksManagerDialog(QDialog):
if not self.apply_process:
self.apply_process = QProcess(self)
self.apply_process.setProcessChannelMode(QProcess.MergedChannels)
env = QProcessEnvironment.systemEnvironment()
env.insert("WINEPREFIX", self.prefix_path)
env.insert("WINE", self.wine_executable)
self.apply_process.setProcessEnvironment(env)
self.apply_process.readyReadStandardOutput.connect(
lambda: self.log_output.append(
@@ -460,7 +460,7 @@ class WinetricksManagerDialog(QDialog):
)
self.apply_process.finished.connect(self.on_apply_finished)
self.apply_process.start(self.winetricks_path, args)
self.apply_process.start(self.winehelper_path, ["winetricks"] + args)
def on_apply_finished(self, exit_code, exit_status):
"""Обрабатывает завершение применения изменений."""
+1 -1
View File
@@ -37,7 +37,7 @@ class WinetricksOutputParser:
DOWNLOAD_AVAILABLE_PATTERN = re.compile(r'\[\s*доступно для скачивания[^]]*\]')
IN_CACHE_PATTERN = re.compile(r'\[\s*в кэше\s*\]')
SERVICE_WORDS = {'executing', 'using', 'warning:'}
SERVICE_WORDS = {'executing', 'using', 'warning:', '#', 'export'}
@classmethod
def parse_installed_verbs(cls, log_path):
+44 -1
View File
@@ -2,6 +2,7 @@
Сервис для управления .desktop файлами.
"""
import os
import re
import shutil
@@ -147,9 +148,47 @@ class DesktopFileManager:
"""
return os.path.exists(self.get_desktop_file_path(app_name))
def _get_exe_path_from_exec(self, exec_line):
"""
Извлекает путь к .exe файлу из строки Exec.
Args:
exec_line: Строка Exec из .desktop файла
Returns:
Путь к .exe файлу или None
"""
if not exec_line:
return None
exec_line = exec_line.split('%')[0].strip()
quoted_match = re.search(r'"([^"]*\.exe)"', exec_line)
if quoted_match:
exe_path = quoted_match.group(1)
if os.path.exists(exe_path):
return exe_path
parts = exec_line.split()
for part in parts:
part_clean = part.strip('"\'')
if part_clean.endswith('.exe'):
if os.path.exists(part_clean):
return part_clean
if not part_clean.startswith('/'):
continue
if parts:
last_part = parts[-1].strip('"\'')
if last_part.endswith('.exe') and os.path.exists(last_part):
return last_part
return None
def get_installed_apps_with_info(self):
"""
Возвращает информацию обо всех установленных приложениях.
Пропускает приложения, у которых .exe файл не найден.
Returns:
Список словарей с информацией о приложениях
@@ -157,11 +196,15 @@ class DesktopFileManager:
apps = []
for app_name in self.list_desktop_files():
data = self.read_desktop_file(app_name)
exec_line = data.get('Exec', '')
exe_path = self._get_exe_path_from_exec(exec_line)
if exe_path is None:
continue
apps.append({
'name': app_name,
'display_name': data.get('Name', app_name),
'icon': data.get('Icon'),
'exec': data.get('Exec'),
'exec': exec_line,
'path': self.get_desktop_file_path(app_name)
})
return apps