From 4610f6a6da49c11681311c1f179526acf34eaafa Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Wed, 1 Oct 2025 15:25:55 +0300 Subject: [PATCH] updated scripts and prefix for t-flex --- autoinstall/t-flex-cad-edu17 | 4 +- autoinstall/t-flex-cad17 | 4 +- autoinstall/t-flex-cad17-applications | 2 +- autoinstall/t-flex-cad17-resources | 2 +- autoinstall/t-flex-cad2d+17 | 4 +- autoinstall/t-flex-docs17 | 4 +- autoinstall/t-flex-viewer17 | 4 +- .../{t-flex-cad17.whdb => t-flex-cad.whdb} | 47 ++++++++----------- manualinstall/t-flex-cad-manual | 23 +++++++++ ...t-flex-cad17-manual => t-flex-docs-manual} | 6 +-- sha256sum.list | 8 +--- 11 files changed, 59 insertions(+), 49 deletions(-) rename database/{t-flex-cad17.whdb => t-flex-cad.whdb} (70%) create mode 100644 manualinstall/t-flex-cad-manual rename manualinstall/{t-flex-cad17-manual => t-flex-docs-manual} (88%) diff --git a/autoinstall/t-flex-cad-edu17 b/autoinstall/t-flex-cad-edu17 index 79870ae..8f6ab8e 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="tflexcad" export WH_WINE_USE="wine_wh_tflex_10-9_amd64" -export BASE_PFX="tflex17_pfx_x64_v02" +export BASE_PFX="tflex_pfx_x64_v03" export WINEARCH="win64" export WH_WINDOWS_VER="10" export WINEPREFIX="tflex" @@ -14,7 +14,7 @@ export WH_USE_MESA_GL_OVERRIDE="1" # используем общий whdb файл для подготовки префикса и сервисов # prepair_wine используется из файла настроек -source "$WH_DB_DIR/t-flex-cad17.whdb" +source "$WH_DB_DIR/t-flex-cad.whdb" # Программа T-FLEX CAD Учебная Версия export AUTOINSTALL_ZIP="${WH_TMP_DIR}/TFCAD_ST_17x64_PACK.zip" diff --git a/autoinstall/t-flex-cad17 b/autoinstall/t-flex-cad17 index 0010e08..e566eb4 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="tflexcad" export WH_WINE_USE="wine_wh_tflex_10-9_amd64" -export BASE_PFX="tflex17_pfx_x64_v02" +export BASE_PFX="tflex_pfx_x64_v03" export WINEARCH="win64" export WH_WINDOWS_VER="10" export WINEPREFIX="tflex" @@ -14,7 +14,7 @@ export WH_USE_MESA_GL_OVERRIDE="1" # используем общий whdb файл для подготовки префикса и сервисов # prepair_wine используется из файла настроек -source "$WH_DB_DIR/t-flex-cad17.whdb" +source "$WH_DB_DIR/t-flex-cad.whdb" # Программа T-FLEX CAD export AUTOINSTALL_ZIP="${WH_TMP_DIR}/T-FLEX CAD 17.zip" diff --git a/autoinstall/t-flex-cad17-applications b/autoinstall/t-flex-cad17-applications index 520ed59..542b405 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="tflexcad" export WH_WINDOWS_VER="10" export WH_WINE_USE="wine_wh_tflex_10-9_amd64" -export BASE_PFX="tflex17_pfx_x64_v02" +export BASE_PFX="tflex_pfx_x64_v03" 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 4adcd56..72786ce 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="tflexcad" export WH_WINDOWS_VER="10" export WH_WINE_USE="wine_wh_tflex_10-9_amd64" -export BASE_PFX="tflex17_pfx_x64_v02" +export BASE_PFX="tflex_pfx_x64_v03" 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 95834ff..f0aaecd 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="tflexcad" export WH_WINE_USE="wine_wh_tflex_10-9_amd64" -export BASE_PFX="tflex17_pfx_x64_v02" +export BASE_PFX="tflex_pfx_x64_v03" export WINEARCH="win64" export WH_WINDOWS_VER="10" export WINEPREFIX="tflex" @@ -14,7 +14,7 @@ export WH_USE_MESA_GL_OVERRIDE="1" # используем общий whdb файл для подготовки префикса и сервисов # prepair_wine используется из файла настроек -source "$WH_DB_DIR/t-flex-cad17.whdb" +source "$WH_DB_DIR/t-flex-cad.whdb" # Программа T-FLEX CAD 2D+ 17 export AUTOINSTALL_ZIP="${WH_TMP_DIR}/T-FLEX CAD 2D+ 17.zip" diff --git a/autoinstall/t-flex-docs17 b/autoinstall/t-flex-docs17 index 70556a7..268b905 100644 --- a/autoinstall/t-flex-docs17 +++ b/autoinstall/t-flex-docs17 @@ -5,7 +5,7 @@ export PROG_URL="https://www.tflexcad.ru" export PROG_NAME="T-FLEX DOCs 17" export PROG_ICON="tflexdoc" export WH_WINE_USE="wine_wh_tflex_10-9_amd64" -export BASE_PFX="tflex17_pfx_x64_v02" +export BASE_PFX="tflex_pfx_x64_v03" export WINEARCH="win64" export WH_WINDOWS_VER="10" export WINEPREFIX="tflex" @@ -14,7 +14,7 @@ export WH_USE_MESA_GL_OVERRIDE="1" # используем общий whdb файл для подготовки префикса и сервисов # prepair_wine используется из файла настроек -source "$WH_DB_DIR/t-flex-cad17.whdb" +source "$WH_DB_DIR/t-flex-cad.whdb" # Программа T-FLEX DOC AUTOINSTALL_ZIP="${WH_TMP_DIR}/T-FLEX DOCs 17 Client.zip" diff --git a/autoinstall/t-flex-viewer17 b/autoinstall/t-flex-viewer17 index 34b7fd3..3acf1ae 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="tflexcad" export WH_WINE_USE="wine_wh_tflex_10-9_amd64" -export BASE_PFX="tflex17_pfx_x64_v02" +export BASE_PFX="tflex_pfx_x64_v03" export WINEARCH="win64" export WH_WINDOWS_VER="10" export WINEPREFIX="tflex" @@ -14,7 +14,7 @@ export WH_USE_MESA_GL_OVERRIDE="1" # используем общий whdb файл для подготовки префикса и сервисов # prepair_wine используется из файла настроек -source "$WH_DB_DIR/t-flex-cad17.whdb" +source "$WH_DB_DIR/t-flex-cad.whdb" # Программа T-FLEX Viewer export AUTOINSTALL_ZIP="${WH_TMP_DIR}/T-FLEX Viewer 17.zip" diff --git a/database/t-flex-cad17.whdb b/database/t-flex-cad.whdb similarity index 70% rename from database/t-flex-cad17.whdb rename to database/t-flex-cad.whdb index 9f01198..e5435fe 100644 --- a/database/t-flex-cad17.whdb +++ b/database/t-flex-cad.whdb @@ -1,28 +1,24 @@ #!/usr/bin/env bash -# info_ru: Компоненты сервисов поддержки T-FLEX 17 +# info_ru: Компоненты сервисов поддержки T-FLEX 17 и 18 ######################################################################## export WH_WINDOWS_VER="10" export WH_WINE_USE="wine_wh_tflex_10-9_amd64" -export BASE_PFX="tflex17_pfx_x64_v02" +export BASE_PFX="tflex_pfx_x64_v03" export WINEARCH="win64" 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" +export INSTALL_DLL="corefonts d3dcompiler_47 dotnet48 vcrun2019 ucrtbase2019 msxml6 fontsmooth=rgb baekmuk droid eufonts ipamona liberation lucida opensymbol sourcehansans tahoma takao uff unifont vlgothic wenquanyi wenquanyizenhei" export WH_USE_MESA_GL_OVERRIDE="1" -# Компоненты поддержки T-FLEX PLM (Linux) GRDCONTROL_VER="4.3.0-0" AUTOINSTALL_ZIP_LIN="$WH_TMP_DIR/Prerequisites_T-FLEX_Linux.zip" AUTOINSTALL_DIR_LIN="$WH_TMP_DIR/Prerequisites_T-FLEX_Linux" -AUTOINSTALL_REG_LIN="$AUTOINSTALL_DIR_LIN/Components/fake_hasp.reg" -# Компоненты поддержки T-FLEX PLM (Windows) -AUTOINSTALL_ZIP_WIN="$WH_TMP_DIR/T-FLEX 17 Prerequisites.zip" -AUTOINSTALL_DIR_WIN="$WH_TMP_DIR/Компоненты поддержки T-FLEX 17" -AUTOINSTALL_EXE_WIN1="$AUTOINSTALL_DIR_WIN/Access Database Engine 2007/AccessDatabaseEngine.exe" -AUTOINSTALL_EXE_WIN_MSI="$AUTOINSTALL_DIR_WIN/Access Database Engine 2007" -AUTOINSTALL_EXE_WIN2="$AUTOINSTALL_DIR_WIN/TSC2/Setup_TSC2.msi" +AUTOINSTALL_EXE_ADE2007="$AUTOINSTALL_DIR_LIN/Components/AccessDatabaseEngine.exe" +AUTOINSTALL_EXE_TSC2="$AUTOINSTALL_DIR_LIN/Components/Setup_TSC2.msi" +AUTOINSTALL_EXE_VC_X86="$AUTOINSTALL_DIR_LIN/Components/vc_redist.x86.exe" +AUTOINSTALL_EXE_VC_X64="$AUTOINSTALL_DIR_LIN/Components/vc_redist.x64.exe" prepair_wine @@ -42,11 +38,8 @@ else || ! systemctl list-units --type service --state running | grep hasplmd \ || ! rpm -q grdcontrol | grep -q "$GRDCONTROL_VER" then - # Компоненты поддержки T-FLEX PLM (Linux) - if try_download "https://www.tflex.ru/downloads/Prerequisites_T-FLEX_Linux.zip" "${AUTOINSTALL_ZIP_LIN}" ; then - unpack "$AUTOINSTALL_ZIP_LIN" "$AUTOINSTALL_DIR_LIN" - "$WINELOADER" regedit "$AUTOINSTALL_REG_LIN" - fi + try_download "https://www.tflex.ru/downloads/Prerequisites_T-FLEX_Linux.zip" "${AUTOINSTALL_ZIP_LIN}" + unpack "$AUTOINSTALL_ZIP_LIN" "$AUTOINSTALL_DIR_LIN" if rpm -q grdcontrol | grep -q "$GRDCONTROL_VER" then print_info "grdcontrol-$GRDCONTROL_VER уже установлен в системе." @@ -55,14 +48,14 @@ else if [[ "$BASE_PFX" == "none" ]] ; then print_info "Запускаем подготовку префикса." - # Компоненты поддержки T-FLEX PLM (Windows) - if try_download "https://www.tflex.ru/downloads/T-FLEX%2017%20Prerequisites.zip" "${AUTOINSTALL_ZIP_WIN}" ; then - unpack "$AUTOINSTALL_ZIP_WIN" "$WH_TMP_DIR" - unpack "$AUTOINSTALL_EXE_WIN1" "$AUTOINSTALL_EXE_WIN_MSI" - wine_run_install "$AUTOINSTALL_EXE_WIN_MSI/AceRedist.msi" /q - wine_run_install "$AUTOINSTALL_EXE_WIN2" /q - fi + unpack "$AUTOINSTALL_EXE_ADE2007" "$AUTOINSTALL_DIR_LIN/ADE2007" + wine_run_install "$AUTOINSTALL_DIR_LIN/ADE2007/AceRedist.msi" /q + + wine_run_install "$AUTOINSTALL_EXE_VC_X86" /quiet + wine_run_install "$AUTOINSTALL_EXE_VC_X64" /quiet + wine_run_install "$AUTOINSTALL_EXE_TSC2" /q + rm -fR "$DRIVE_C/Program Files/Common Files/System" rm -fR "$DRIVE_C/Program Files (x86)/Common Files/System" @@ -74,9 +67,9 @@ else mv -f "$AUTOINSTALL_DIR_LIN/Components/Windows/System32/"*.dll \ "$DRIVE_C/windows/system32" + "$WINELOADER" regedit "$AUTOINSTALL_DIR_LIN/Components/fake_hasp.reg" "$WINELOADER" regedit "$AUTOINSTALL_DIR_LIN/Components/ado-32.reg" - "$WINELOADER"64 regedit "$AUTOINSTALL_DIR_LIN/Components/ado-64.reg" - "$WINELOADER" regedit "$AUTOINSTALL_DIR_LIN/Components/tflex.reg" + "$WINELOADER" regedit "$AUTOINSTALL_DIR_LIN/Components/ado-64.reg" fi if systemctl list-units --type service --state running | grep aksusbd \ @@ -98,14 +91,12 @@ else fi try_remove_dir "$AUTOINSTALL_DIR_LIN" - try_remove_dir "$AUTOINSTALL_DIR_WIN" if [[ $TFLEX_ERROR == "1" ]] ; then fatal "Произошла ошибка во время подготовки префикса, или установки компонентов ПО." else echo "t-flex-cad-prepair" >> "$WINEPREFIX/winetricks.log" - try_remove_file "$AUTOINSTALL_ZIP_LIN" - try_remove_file "$AUTOINSTALL_ZIP_WIN" +# try_remove_file "$AUTOINSTALL_ZIP_LIN" print_info "Подготовка префикса и установка компонентов завершены." fi fi diff --git a/manualinstall/t-flex-cad-manual b/manualinstall/t-flex-cad-manual new file mode 100644 index 0000000..c840535 --- /dev/null +++ b/manualinstall/t-flex-cad-manual @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +# info_ru: Ручная установка дополнений для T-FLEX DOCS 17 или 18 +######################################################################## +export PROG_NAME="T-FLEX CAD 17" +export PROG_ICON="tflexcad" +export WH_WINE_USE="wine_wh_tflex_10-9_amd64" +export BASE_PFX="tflex_pfx_x64_v03" +export WINEARCH="win64" +export WH_WINDOWS_VER="10" +export WINEPREFIX="tflex" +export WH_XDG_OPEN="log" +export WH_USE_MESA_GL_OVERRIDE="1" + +if [[ -f "$2" ]] ; then + # используем общий whdb файл для подготовки префикса и сервисов + # prepair_wine используется из файла настроек + source "$WH_DB_DIR/t-flex-cad.whdb" + + wine_run_install "$2" +else + fatal "Не найден файл установки. Перезапустите по примеру: + winehelper install $1 \"/путь/до/файла\"" +fi diff --git a/manualinstall/t-flex-cad17-manual b/manualinstall/t-flex-docs-manual similarity index 88% rename from manualinstall/t-flex-cad17-manual rename to manualinstall/t-flex-docs-manual index f29c7e6..729795c 100644 --- a/manualinstall/t-flex-cad17-manual +++ b/manualinstall/t-flex-docs-manual @@ -1,10 +1,10 @@ #!/usr/bin/env bash -# info_ru: Ручная установка дополнений для T-FLEX CAD 17 +# info_ru: Ручная установка дополнений для T-FLEX CAD 17 или 18 ######################################################################## export PROG_NAME="T-FLEX CAD 17" export PROG_ICON="tflexcad" export WH_WINE_USE="wine_wh_tflex_10-9_amd64" -export BASE_PFX="tflex17_pfx_x64_v02" +export BASE_PFX="tflex_pfx_x64_v03" export WINEARCH="win64" export WH_WINDOWS_VER="10" export WINEPREFIX="tflex" @@ -14,7 +14,7 @@ export WH_USE_MESA_GL_OVERRIDE="1" if [[ -f "$2" ]] ; then # используем общий whdb файл для подготовки префикса и сервисов # prepair_wine используется из файла настроек - source "$WH_DB_DIR/t-flex-cad17.whdb" + source "$WH_DB_DIR/t-flex-cad.whdb" wine_run_install "$2" else diff --git a/sha256sum.list b/sha256sum.list index d34b264..f733807 100644 --- a/sha256sum.list +++ b/sha256sum.list @@ -171,13 +171,9 @@ d62225f6a23e49355a59a2bd9a495390694bd70d4be6d6527cfb7fb2e2d65f0d defpfx_x64_v01 # 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 gdiplus lucida tahoma ucrtbase2019 vcrun2019 dotnet40 dotnet48 dotnet20sp2 d3dcompiler_47 -f4cb2f380ad8887f334c6eb3c272b343ae8de327764945266e9e74f8acbac69f tflex17_pfx_x64_v01.tar.xz -# create with wine_x_tkg_10-0_amd64 (universal user: xuser) -# winetricks isolate_home msxml6 ipamona opensymbol wenquanyi ucrtbase2019 uff unifont droid wenquanyizenhei remove_mono internal dotnet40 dotnet48 dotnet20sp2 eufonts takao d3dcompiler_47 fontsmooth=rgb vcrun2022 vlgothic andale arial comicsans courier georgia impact times trebuchet verdana webdings corefonts liberation sourcehansans baekmuk tahoma lucida - -be09f25bb795c5f912fad2d122c68c8aed937821255f161c2d75a4773d11a044 tflex17_pfx_x64_v02.tar.xz +95d90268639a9d8b1ba949bfa49ba17a47899a1e8ae9083afbb826af88b9ba8b tflex_pfx_x64_v03.tar.xz # create with wine_wh_tflex_10-9_amd64 -# winetricks isolate_home msxml6 ipamona opensymbol wenquanyi ucrtbase2019 uff unifont droid wenquanyizenhei remove_mono internal dotnet40 dotnet48 dotnet20 eufonts takao d3dcompiler_47 fontsmooth=rgb vcrun2022 vlgothic andale arial comicsans courier georgia impact times trebuchet verdana webdings corefonts liberation sourcehansans baekmuk tahoma lucida +# winetricks isolate_home msxml6 ipamona opensymbol wenquanyi ucrtbase2019 uff unifont droid wenquanyizenhei remove_mono internal dotnet40 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 7edbd69b40b8ca3fb3594933c6cd37030180c494c08fd13cbd1a5b46565d65e6 ved_ctm_pfx_x86_v03.tar.xz # create with wine_x_tkg_10-0_amd64 (universal user: xuser)