From 07ca88cb644fd4897981983b5f357b88feb673b1 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Tue, 16 Dec 2025 15:46:19 +0300 Subject: [PATCH] updated t-flex pfx v04 --- autoinstall/t-flex-cad-edu17 | 2 +- autoinstall/t-flex-cad17 | 2 +- autoinstall/t-flex-cad17-applications | 2 +- autoinstall/t-flex-cad17-resources | 2 +- autoinstall/t-flex-cad18 | 2 +- autoinstall/t-flex-cad18-applications | 2 +- autoinstall/t-flex-cad18-resources | 2 +- autoinstall/t-flex-cad2d+17 | 2 +- autoinstall/t-flex-cad2d+18 | 2 +- autoinstall/t-flex-docs17 | 3 ++- autoinstall/t-flex-viewer17 | 2 +- autoinstall/t-flex-viewer18 | 2 +- database/t-flex-cad.whdb | 8 +++++--- manualinstall/t-flex-cad-manual | 2 +- manualinstall/t-flex-docs-manual | 3 ++- sha256sum.list | 4 ++++ 16 files changed, 25 insertions(+), 17 deletions(-) diff --git a/autoinstall/t-flex-cad-edu17 b/autoinstall/t-flex-cad-edu17 index b47efaa..5a85751 100644 --- a/autoinstall/t-flex-cad-edu17 +++ b/autoinstall/t-flex-cad-edu17 @@ -5,7 +5,7 @@ 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 BASE_PFX="tflex_pfx_x64_v03" +export BASE_PFX="tflex_pfx_x64_v04" export WINEARCH="win64" export WH_WINDOWS_VER="10" export WINEPREFIX="tflex" diff --git a/autoinstall/t-flex-cad17 b/autoinstall/t-flex-cad17 index 3b8d0fe..2e2bc34 100644 --- a/autoinstall/t-flex-cad17 +++ b/autoinstall/t-flex-cad17 @@ -5,7 +5,7 @@ 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 BASE_PFX="tflex_pfx_x64_v03" +export BASE_PFX="tflex_pfx_x64_v04" export WINEARCH="win64" export WH_WINDOWS_VER="10" export WINEPREFIX="tflex" diff --git a/autoinstall/t-flex-cad17-applications b/autoinstall/t-flex-cad17-applications index 8da4055..fecc2a1 100644 --- a/autoinstall/t-flex-cad17-applications +++ b/autoinstall/t-flex-cad17-applications @@ -6,7 +6,7 @@ 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 BASE_PFX="tflex_pfx_x64_v03" +export BASE_PFX="tflex_pfx_x64_v04" export WINEARCH="win64" export WINEPREFIX="tflex" export WH_XDG_OPEN="log" diff --git a/autoinstall/t-flex-cad17-resources b/autoinstall/t-flex-cad17-resources index b7f40bd..33d4cce 100644 --- a/autoinstall/t-flex-cad17-resources +++ b/autoinstall/t-flex-cad17-resources @@ -6,7 +6,7 @@ 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 BASE_PFX="tflex_pfx_x64_v03" +export BASE_PFX="tflex_pfx_x64_v04" export WINEARCH="win64" export WINEPREFIX="tflex" export WH_XDG_OPEN="log" diff --git a/autoinstall/t-flex-cad18 b/autoinstall/t-flex-cad18 index 2a43d63..a1875f2 100644 --- a/autoinstall/t-flex-cad18 +++ b/autoinstall/t-flex-cad18 @@ -5,7 +5,7 @@ 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 BASE_PFX="tflex_pfx_x64_v03" +export BASE_PFX="tflex_pfx_x64_v04" export WINEARCH="win64" export WH_WINDOWS_VER="10" export WINEPREFIX="tflex" diff --git a/autoinstall/t-flex-cad18-applications b/autoinstall/t-flex-cad18-applications index 1515f11..88dc659 100644 --- a/autoinstall/t-flex-cad18-applications +++ b/autoinstall/t-flex-cad18-applications @@ -6,7 +6,7 @@ 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 BASE_PFX="tflex_pfx_x64_v03" +export BASE_PFX="tflex_pfx_x64_v04" export WINEARCH="win64" export WINEPREFIX="tflex" export WH_XDG_OPEN="log" diff --git a/autoinstall/t-flex-cad18-resources b/autoinstall/t-flex-cad18-resources index eb0a10b..207bba3 100644 --- a/autoinstall/t-flex-cad18-resources +++ b/autoinstall/t-flex-cad18-resources @@ -6,7 +6,7 @@ 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 BASE_PFX="tflex_pfx_x64_v03" +export BASE_PFX="tflex_pfx_x64_v04" export WINEARCH="win64" export WINEPREFIX="tflex" export WH_XDG_OPEN="log" diff --git a/autoinstall/t-flex-cad2d+17 b/autoinstall/t-flex-cad2d+17 index e45669a..6168f20 100644 --- a/autoinstall/t-flex-cad2d+17 +++ b/autoinstall/t-flex-cad2d+17 @@ -5,7 +5,7 @@ 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 BASE_PFX="tflex_pfx_x64_v03" +export BASE_PFX="tflex_pfx_x64_v04" export WINEARCH="win64" export WH_WINDOWS_VER="10" export WINEPREFIX="tflex" diff --git a/autoinstall/t-flex-cad2d+18 b/autoinstall/t-flex-cad2d+18 index 904caa0..caf110f 100644 --- a/autoinstall/t-flex-cad2d+18 +++ b/autoinstall/t-flex-cad2d+18 @@ -5,7 +5,7 @@ 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 BASE_PFX="tflex_pfx_x64_v03" +export BASE_PFX="tflex_pfx_x64_v04" export WINEARCH="win64" export WH_WINDOWS_VER="10" export WINEPREFIX="tflex" diff --git a/autoinstall/t-flex-docs17 b/autoinstall/t-flex-docs17 index 434ea8b..9ea86f4 100644 --- a/autoinstall/t-flex-docs17 +++ b/autoinstall/t-flex-docs17 @@ -5,12 +5,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 BASE_PFX="tflex_pfx_x64_v03" +export BASE_PFX="tflex_pfx_x64_v04" export WINEARCH="win64" export WH_WINDOWS_VER="10" export WINEPREFIX="tflex" export WH_XDG_OPEN="log" export WH_USE_MESA_GL_OVERRIDE="1" +export WINE_D3D_CONFIG="renderer=gdi" # используем общий whdb файл для подготовки префикса и сервисов # prepair_wine используется из файла настроек diff --git a/autoinstall/t-flex-viewer17 b/autoinstall/t-flex-viewer17 index 4fc6fe4..aa5008b 100644 --- a/autoinstall/t-flex-viewer17 +++ b/autoinstall/t-flex-viewer17 @@ -5,7 +5,7 @@ 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 BASE_PFX="tflex_pfx_x64_v03" +export BASE_PFX="tflex_pfx_x64_v04" export WINEARCH="win64" export WH_WINDOWS_VER="10" export WINEPREFIX="tflex" diff --git a/autoinstall/t-flex-viewer18 b/autoinstall/t-flex-viewer18 index 325e85e..8eda364 100644 --- a/autoinstall/t-flex-viewer18 +++ b/autoinstall/t-flex-viewer18 @@ -5,7 +5,7 @@ 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 BASE_PFX="tflex_pfx_x64_v03" +export BASE_PFX="tflex_pfx_x64_v04" export WINEARCH="win64" export WH_WINDOWS_VER="10" export WINEPREFIX="tflex" diff --git a/database/t-flex-cad.whdb b/database/t-flex-cad.whdb index 98cd199..1457323 100644 --- a/database/t-flex-cad.whdb +++ b/database/t-flex-cad.whdb @@ -3,12 +3,13 @@ ######################################################################## export WH_WINDOWS_VER="10" export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64" -export BASE_PFX="tflex_pfx_x64_v03" +export BASE_PFX="tflex_pfx_x64_v04" export WINEARCH="win64" export WINEPREFIX="tflex" export PROG_VERSION="" export WH_XDG_OPEN="log" -export INSTALL_DLL="corefonts d3dcompiler_47 dotnet48 dotnet20 vcrun2019 ucrtbase2019 msxml6 fontsmooth=rgb baekmuk droid eufonts ipamona liberation lucida opensymbol sourcehansans tahoma takao uff unifont vlgothic wenquanyi wenquanyizenhei" +export INSTALL_DLL="d3dcompiler_47 dotnet48 dotnet20 vcrun2019 ucrtbase2019 msxml6" +# fontsmooth=rgb corefonts baekmuk droid eufonts ipamona liberation lucida opensymbol sourcehansans tahoma takao uff unifont vlgothic wenquanyi wenquanyizenhei" export WH_USE_MESA_GL_OVERRIDE="1" GRDCONTROL_VER="4.3.0-0" @@ -31,9 +32,10 @@ then print_info "Префикс $PREFIX_NAME готов к установке ПО." print_info "Сервисы: aksusbd и hasplmd уже запущены. grdcontrol-$GRDCONTROL_VER установлен." else - print_warning "Службы aksusbd и hasplmd не запущены, или grdcontrol-$GRDCONTROL_VER не установлен." + print_warning "Проверка и подготовка префикса, служб aksusbd, hasplmd и grdcontrol-$GRDCONTROL_VER." if [[ "$BASE_PFX" == "none" ]] \ + || ! grep -q "t-flex-cad" "$WINEPREFIX/winetricks.log" \ || ! systemctl list-units --type service --state running | grep aksusbd \ || ! systemctl list-units --type service --state running | grep hasplmd \ || ! rpm -q grdcontrol | grep -q "$GRDCONTROL_VER" diff --git a/manualinstall/t-flex-cad-manual b/manualinstall/t-flex-cad-manual index 371a40a..c7b8b23 100644 --- a/manualinstall/t-flex-cad-manual +++ b/manualinstall/t-flex-cad-manual @@ -4,7 +4,7 @@ export PROG_NAME="T-FLEX CAD 17/18" export ICONS_BUTTON_GUI="tflexcad17 tflexcad18" export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64" -export BASE_PFX="tflex_pfx_x64_v03" +export BASE_PFX="tflex_pfx_x64_v04" export WINEARCH="win64" export WH_WINDOWS_VER="10" export WINEPREFIX="tflex" diff --git a/manualinstall/t-flex-docs-manual b/manualinstall/t-flex-docs-manual index 041f30b..4c1a3f2 100644 --- a/manualinstall/t-flex-docs-manual +++ b/manualinstall/t-flex-docs-manual @@ -4,12 +4,13 @@ export PROG_NAME="T-FLEX DOCS 17/18" export PROG_ICON="tflexdoc17" export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64" -export BASE_PFX="tflex_pfx_x64_v03" +export BASE_PFX="tflex_pfx_x64_v04" export WINEARCH="win64" export WH_WINDOWS_VER="10" export WINEPREFIX="tflex" export WH_XDG_OPEN="log" export WH_USE_MESA_GL_OVERRIDE="1" +export WINE_D3D_CONFIG="renderer=gdi" if [[ -f "$2" ]] ; then # используем общий whdb файл для подготовки префикса и сервисов diff --git a/sha256sum.list b/sha256sum.list index 6280738..9ecdfd1 100644 --- a/sha256sum.list +++ b/sha256sum.list @@ -143,6 +143,10 @@ eb1fec64eea3d83f2bdce185c7bc0c1a93afb51139f16256c885098a6f7e2242 defpfx_dn48_x6 # create with wine_wh_tflex_10-9_amd64 # winetricks isolate_home msxml6 ipamona opensymbol wenquanyi ucrtbase2019 uff unifont droid wenquanyizenhei internal dotnet48 dotnet20 eufonts takao d3dcompiler_47 fontsmooth=rgb vcrun2019 vlgothic andale arial comicsans courier georgia impact times trebuchet verdana webdings corefonts liberation sourcehansans baekmuk tahoma lucida t-flex-cad-prepair +e71a03b4d26d7ac7091ed526d50103f95cb08ce53dd54a7f52381b8b74c1bc17 tflex_pfx_x64_v04.tar.xz +# create with wine-10.18.1-tflex-alt2-wow64 +# winetricks isolate_home msxml6 ucrtbase2019 fontfix dotnet20 dotnet40 dotnet48 d3dcompiler_47 vcrun2019 + 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