From 0bb88f6bff6d6f1c51a3e8238a0133860d6e7a43 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Mon, 7 Jul 2025 20:17:14 +0300 Subject: [PATCH] updated scripts: all t-flex programs --- 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-cad2d+17 | 2 +- autoinstall/t-flex-docs17 | 2 +- autoinstall/t-flex-viewer17 | 2 +- database/t-flex-cad17.whdb | 70 ++++++++++++++------------- manualinstall/t-flex-cad17-manual | 2 +- 9 files changed, 45 insertions(+), 41 deletions(-) diff --git a/autoinstall/t-flex-cad-edu17 b/autoinstall/t-flex-cad-edu17 index ff4822e..d27eefb 100644 --- a/autoinstall/t-flex-cad-edu17 +++ b/autoinstall/t-flex-cad-edu17 @@ -3,7 +3,7 @@ ######################################################################## export PROG_NAME="T-FLEX CAD Учебная Версия 17" export PROG_ICON="tflexcad" -export WH_WINE_USE="wine_x_tkg_10-0_amd64" +export WH_WINE_USE="wine_wh_tflex_10-9_amd64" export WINEARCH="win64" export WH_WINDOWS_VER="10" export WINEPREFIX="tflex17" diff --git a/autoinstall/t-flex-cad17 b/autoinstall/t-flex-cad17 index fb19515..bd8eb94 100644 --- a/autoinstall/t-flex-cad17 +++ b/autoinstall/t-flex-cad17 @@ -3,7 +3,7 @@ ######################################################################## export PROG_NAME="T-FLEX CAD 17" export PROG_ICON="tflexcad" -export WH_WINE_USE="wine_x_tkg_10-0_amd64" +export WH_WINE_USE="wine_wh_tflex_10-9_amd64" export WINEARCH="win64" export WH_WINDOWS_VER="10" export WINEPREFIX="tflex17" diff --git a/autoinstall/t-flex-cad17-applications b/autoinstall/t-flex-cad17-applications index 580c9b2..ab67f94 100644 --- a/autoinstall/t-flex-cad17-applications +++ b/autoinstall/t-flex-cad17-applications @@ -2,7 +2,7 @@ # info_ru: Приложения для T-FLEX CAD 17 (T-FLEX Анализ 17, T-FLEX Динамика 17, T-FLEX Зубчатые передачи 17, T-FLEX ЧПУ 17, T-FLEX Раскрой 17, T-FLEX Электротехника 17, T-FLEX VR 17, T-FLEX Печатные платы 17) ######################################################################## export WH_WINDOWS_VER="10" -export WH_WINE_USE="wine_x_tkg_10-0_amd64" +export WH_WINE_USE="wine_wh_tflex_10-9_amd64" export BASE_PFX="tflex17_pfx_x64_v01" export WINEARCH="win64" export WINEPREFIX="tflex17" diff --git a/autoinstall/t-flex-cad17-resources b/autoinstall/t-flex-cad17-resources index 162de92..06456ab 100644 --- a/autoinstall/t-flex-cad17-resources +++ b/autoinstall/t-flex-cad17-resources @@ -2,7 +2,7 @@ # info_ru: Обучающие материалы, примеры, бесплатные библиотеки для T-FLEX CAD 17 (Учебное пособие 17, Стандартные элементы 17, Элементы уплотнительной техники 17, Станочные приспособления 17, Детали штампов листовой штамповки 17, Детали пресс-форм 17, Примеры 17) ######################################################################## export WH_WINDOWS_VER="10" -export WH_WINE_USE="wine_x_tkg_10-0_amd64" +export WH_WINE_USE="wine_wh_tflex_10-9_amd64" export BASE_PFX="tflex17_pfx_x64_v01" export WINEARCH="win64" export WINEPREFIX="tflex17" diff --git a/autoinstall/t-flex-cad2d+17 b/autoinstall/t-flex-cad2d+17 index c7fde9f..04f3ace 100644 --- a/autoinstall/t-flex-cad2d+17 +++ b/autoinstall/t-flex-cad2d+17 @@ -3,7 +3,7 @@ ######################################################################## export PROG_NAME="T-FLEX CAD 2D+ 17" export PROG_ICON="tflexcad" -export WH_WINE_USE="wine_x_tkg_10-0_amd64" +export WH_WINE_USE="wine_wh_tflex_10-9_amd64" export WINEARCH="win64" export WH_WINDOWS_VER="10" export WINEPREFIX="tflex17" diff --git a/autoinstall/t-flex-docs17 b/autoinstall/t-flex-docs17 index 994c2a5..d14a2da 100644 --- a/autoinstall/t-flex-docs17 +++ b/autoinstall/t-flex-docs17 @@ -3,7 +3,7 @@ ######################################################################## export PROG_NAME="T-FLEX DOCs 17" export PROG_ICON="tflexdoc" -export WH_WINE_USE="wine_x_tkg_10-0_amd64" +export WH_WINE_USE="wine_wh_tflex_10-9_amd64" export WINEARCH="win64" export WH_WINDOWS_VER="10" export WINEPREFIX="tflex17" diff --git a/autoinstall/t-flex-viewer17 b/autoinstall/t-flex-viewer17 index 538b26d..6cf7e97 100644 --- a/autoinstall/t-flex-viewer17 +++ b/autoinstall/t-flex-viewer17 @@ -3,7 +3,7 @@ ######################################################################## export PROG_NAME="T-FLEX Viewer 17" export PROG_ICON="tflexcad" -export WH_WINE_USE="wine_x_tkg_10-0_amd64" +export WH_WINE_USE="wine_wh_tflex_10-9_amd64" export WINEARCH="win64" export WH_WINDOWS_VER="10" export WINEPREFIX="tflex17" diff --git a/database/t-flex-cad17.whdb b/database/t-flex-cad17.whdb index a4ac440..463f220 100644 --- a/database/t-flex-cad17.whdb +++ b/database/t-flex-cad17.whdb @@ -2,7 +2,7 @@ # info_ru: Компоненты сервисов поддержки T-FLEX 17 ######################################################################## export WH_WINDOWS_VER="10" -export WH_WINE_USE="wine_x_tkg_10-0_amd64" +export WH_WINE_USE="wine_wh_tflex_10-9_amd64" export BASE_PFX="tflex17_pfx_x64_v01" export WINEARCH="win64" export WINEPREFIX="tflex17" @@ -11,6 +11,18 @@ 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 WH_USE_MESA_GL_OVERRIDE="1" +# Компоненты поддержки T-FLEX PLM 17 (Linux) +AUTOINSTALL_ZIP_LIN="$WH_TMP_DIR/Prerequisites_T-FLEX_17_Linux.zip" +AUTOINSTALL_DIR_LIN="$WH_TMP_DIR/Prerequisites_T-FLEX_17_Linux" +AUTOINSTALL_REG_LIN="$AUTOINSTALL_DIR_LIN/Components/fake_hasp.reg" + +# Компоненты поддержки T-FLEX PLM 17 (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" + prepair_wine if [[ -d "$WINEPREFIX" ]] \ @@ -29,41 +41,29 @@ else || ! systemctl list-units --type service --state running | grep hasplmd then # Компоненты поддержки T-FLEX PLM 17 (Linux) - AUTOINSTALL_ZIP_LIN="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux.zip" - AUTOINSTALL_DIR_LIN="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux" - AUTOINSTALL_EXE_LIN1="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/fake_hasp.reg" if try_download "https://www.tflex.ru/downloads/Prerequisites_T-FLEX_17_Linux.zip" "${AUTOINSTALL_ZIP_LIN}" ; then - unpack "${AUTOINSTALL_ZIP_LIN}" "${AUTOINSTALL_DIR_LIN}" - try_remove_file "$AUTOINSTALL_ZIP_LIN" - "$WINELOADER" regedit "${AUTOINSTALL_EXE_LIN1}" + unpack "$AUTOINSTALL_ZIP_LIN" "$AUTOINSTALL_DIR_LIN" + "$WINELOADER" regedit "$AUTOINSTALL_REG_LIN" fi if [[ "$BASE_PFX" == "none" ]] ; then # Компоненты поддержки T-FLEX PLM 17 (Windows) - AUTOINSTALL_ZIP_WIN="${WH_TMP_DIR}/T-FLEX 17 Prerequisites.zip" - AUTOINSTALL_DIRWIN="${WH_TMP_DIR}" - AUTOINSTALL_EXE_WIN1="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/Access Database Engine 2007/AccessDatabaseEngine.exe" - AUTOINSTALL_EXE_WIN_MSY="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/Access Database Engine 2007" - AUTOINSTALL_EXE_WIN2="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/TSC2/Setup_TSC2.msi" if try_download "https://www.tflex.ru/downloads/T-FLEX%2017%20Prerequisites.zip" "${AUTOINSTALL_ZIP_WIN}" ; then - unpack "${AUTOINSTALL_ZIP_WIN}" "${AUTOINSTALL_DIRWIN}" - try_remove_file "$AUTOINSTALL_ZIP_WIN" + unpack "$AUTOINSTALL_ZIP_WIN" "$WH_TMP_DIR" + unpack "$AUTOINSTALL_EXE_WIN1" "$AUTOINSTALL_EXE_WIN_MSI" - unpack "${AUTOINSTALL_EXE_WIN1}" "${AUTOINSTALL_EXE_WIN_MSY}" - try_remove_file "$AUTOINSTALL_EXE_WIN1" - - wine_run_install "${AUTOINSTALL_EXE_WIN_MSY}/AceRedist.msi" /q - wine_run_install "${AUTOINSTALL_EXE_WIN2}" /q + wine_run_install "$AUTOINSTALL_EXE_WIN_MSI/AceRedist.msi" /q + wine_run_install "$AUTOINSTALL_EXE_WIN2" /q fi rm -fR "$DRIVE_C/Program Files/Common Files/System" rm -fR "$DRIVE_C/Program Files (x86)/Common Files/System" - cp -r "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Program Files/Common Files/System" "$DRIVE_C/Program Files/Common Files" - cp -r "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Program Files (x86)/Common Files/System" "$DRIVE_C/Program Files (x86)/Common Files" - mv -f "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Windows/System32/"*.dll "$DRIVE_C/windows/system32" + cp -r "$WH_TMP_DIR/Prerequisites_T-FLEX_17_Linux/Components/Program Files/Common Files/System" "$DRIVE_C/Program Files/Common Files" + cp -r "$WH_TMP_DIR/Prerequisites_T-FLEX_17_Linux/Components/Program Files (x86)/Common Files/System" "$DRIVE_C/Program Files (x86)/Common Files" + mv -f "$WH_TMP_DIR/Prerequisites_T-FLEX_17_Linux/Components/Windows/System32/"*.dll "$DRIVE_C/windows/system32" - "$WINELOADER" regedit "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/ado-32.reg" - "$WINELOADER"64 regedit "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/ado-64.reg" - "$WINELOADER" regedit "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/tflex.reg" + "$WINELOADER" regedit "$WH_TMP_DIR/Prerequisites_T-FLEX_17_Linux/Components/ado-32.reg" + "$WINELOADER"64 regedit "$WH_TMP_DIR/Prerequisites_T-FLEX_17_Linux/Components/ado-64.reg" + "$WINELOADER" regedit "$WH_TMP_DIR/Prerequisites_T-FLEX_17_Linux/Components/tflex.reg" fi if systemctl list-units --type service --state running | grep aksusbd \ @@ -72,23 +72,27 @@ else print_info "Службы aksusbd и hasplmd уже запущены. Пропускаем..." else echo "#!/usr/bin/env bash - cd \"${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/HASP_Linux/aksusbd/\" + cd \"$WH_TMP_DIR/Prerequisites_T-FLEX_17_Linux/HASP_Linux/aksusbd/\" bash ./dinst - mv -f \"${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/HASP_Linux/\"*.so /var/hasplm/ - systemctl restart hasplmd.service" > "${WH_TMP_DIR}/tflex17_aksusbd.sh" - chmod +x ${WH_TMP_DIR}/tflex17_aksusbd.sh + mv -f \"$WH_TMP_DIR/Prerequisites_T-FLEX_17_Linux/HASP_Linux/\"*.so /var/hasplm/ + systemctl restart hasplmd.service" > "$WH_TMP_DIR/tflex17_aksusbd.sh" + chmod +x $WH_TMP_DIR/tflex17_aksusbd.sh unset TFLEX_ERROR - su_run "${WH_TMP_DIR}/tflex17_aksusbd.sh" || TFLEX_ERROR=1 - try_remove_file "${WH_TMP_DIR}/tflex17_aksusbd.sh" + print_info "Будут установлены и запущены службы aksusbd и hasplmd." + su_run "$WH_TMP_DIR/tflex17_aksusbd.sh" || TFLEX_ERROR=1 + try_remove_file "$WH_TMP_DIR/tflex17_aksusbd.sh" fi - try_remove_dir "$AUTOINSTALL_DIR_LIN" - try_remove_dir "${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/" fi + try_remove_dir "$AUTOINSTALL_DIR_LIN" + try_remove_dir "$AUTOINSTALL_DIR_WIN" + if [[ $TFLEX_ERROR == "1" ]] ; then fatal "Произошла ошибка во время подготовки префикса, или установки компонентов ПО." else echo "t-flex-cad17-prepair" >> "$WINEPREFIX/winetricks.log" + try_remove_file "$AUTOINSTALL_ZIP_LIN" + try_remove_file "$AUTOINSTALL_ZIP_WIN" print_info "Подготовка префикса и установка компонентов завершены." fi fi diff --git a/manualinstall/t-flex-cad17-manual b/manualinstall/t-flex-cad17-manual index 2260af3..66ea6d5 100644 --- a/manualinstall/t-flex-cad17-manual +++ b/manualinstall/t-flex-cad17-manual @@ -3,7 +3,7 @@ ######################################################################## export PROG_NAME="T-FLEX CAD 17" export PROG_ICON="tflexcad" -export WH_WINE_USE="wine_x_tkg_10-0_amd64" +export WH_WINE_USE="wine_wh_tflex_10-9_amd64" export WINEARCH="win64" export WH_WINDOWS_VER="10" export WINEPREFIX="tflex17"