updated changelog to 0.3.4

added pfx and updated daobit scripts
Merge branch 'minergenon-daobit_unpack'
2025-04-14 16:28:24 +03:00 · 2025-04-14 16:25:20 +03:00 · 2025-04-14 15:09:09 +03:00 · 2025-04-14 17:28:25 +06:00 · 2025-04-14 12:50:02 +03:00 · 2025-04-14 12:49:22 +03:00
14 changed files with 509 additions and 0 deletions
--- a/10
+++ b/10
@ -1,5 +1,15 @@
 История изменений:

+0.3.4:
+* добавлены скрипты установки специализированных программных решений для железнодорожной логистики daobit:
+    winehelper install daobit-cservice "/путь/до/установочного_файла"  -  "Сервис обновления ПО"
+    winehelper install daobit-ratlas "/путь/до/установочного_файла"  -  "R-Атлас"
+    winehelper install daobit-rinfo "/путь/до/установочного_файла"  -  "R-Инфо"
+    winehelper install daobit-rtariff "/путь/до/установочного_файла"  -  "R-Тариф"
+* добавлена автоустановка:
+    winehelper install scadoffice  -  "Программный комплекс для расчёта строительных конструкций"
+* добавлена возможность запуска приложений в сессии XRDP
+
 0.3.3:
 * добавлены скрипты установки:
    winehelper install is-record-station "/путь/до/установочного_файла"
--- a/autoinstall/t-flex-cad-edu17
+++ b/autoinstall/t-flex-cad-edu17
@ -0,0 +1,96 @@
+#!/usr/bin/env bash
+# info_ru: Учебная версия. САПР, объединяющая в себе мощные параметрические возможности 2D и 3D-моделирования со средствами создания и оформления чертежей и конструкторской документации по ЕСКД.
+########################################################################
+export PROG_NAME="T-FLEX CAD Учебная Версия 17"
+export WH_WINDOWS_VER="10"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export BASE_PFX="tflex17_pfx_x64_v01"
+export WINEARCH="win64"
+export WINEPREFIX="tflex17"
+export PROG_VERSION=""
+export PROG_ICON="tflexcad"
+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"
+
+prepair_wine
+if [[ "$BASE_PFX" == "none" ]] \
+|| ! systemctl list-units --type service --state running | grep aksusbd \
+|| ! 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
+        7z x -y "${AUTOINSTALL_ZIP_LIN}" -o"${AUTOINSTALL_DIR_LIN}"
+        try_remove_file "$AUTOINSTALL_ZIP_LIN"
+        "$WINELOADER" regedit "${AUTOINSTALL_EXE_LIN1}"
+    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
+            7z x -y "${AUTOINSTALL_ZIP_WIN}" -o"${AUTOINSTALL_DIRWIN}"
+            try_remove_file "$AUTOINSTALL_ZIP_WIN"
+
+            7z x -y "${AUTOINSTALL_EXE_WIN1}" -o"${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
+        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"
+
+        "$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 \
+    && systemctl list-units --type service --state running | grep hasplmd
+    then
+        print_info "Службы aksusbd и hasplmd уже запущены. Пропускаем..."
+    else
+        echo "#!/usr/bin/env bash
+        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
+        su_run "${WH_TMP_DIR}/tflex17_aksusbd.sh"
+        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
+
+# Программа T-FLEX CAD Учебная Версия
+export AUTOINSTALL_ZIP="${WH_TMP_DIR}/TFCAD_ST_17x64_PACK.zip"
+export AUTOINSTALL_DIR="${WH_TMP_DIR}"
+export AUTOINSTALL_EDUCATION="${WH_TMP_DIR}/T-FLEX CAD Учебная Версия 17/T-FLEX CAD Учебная Версия 17.msi"
+export AUTOINSTALL_COMPONENTS="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/Setup.exe"
+export AUTOINSTALL_ELEMENTS="${WH_TMP_DIR}/Стандартные элементы 17/Стандартные элементы 17.msi"
+
+if try_download "https://www.tflexcad.ru/download/t-flex-cad-free/files/TFCAD_ST_17x64_PACK.zip" "${AUTOINSTALL_ZIP}" ; then
+    7z x -y "${AUTOINSTALL_ZIP}" -o"${AUTOINSTALL_DIR}"
+    try_remove_file "${AUTOINSTALL_ZIP}"
+
+    wine_run_install "${AUTOINSTALL_EDUCATION}" /q
+    wine_run_install "${AUTOINSTALL_COMPONENTS}" /q
+    wine_run_install "${AUTOINSTALL_ELEMENTS}" /q
+    try_remove_file "${WH_TMP_DIR}/Setup.exe"
+    try_remove_dir "${WH_TMP_DIR}/T-FLEX CAD Учебная Версия 17"
+    try_remove_dir "${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17"
+    try_remove_dir "${WH_TMP_DIR}/Стандартные элементы 17"
+
+    WIN_FILE_EXEC="$DRIVE_C/Program Files/T-FLEX CAD Учебная Версия 17/Program/TFlexCad.exe"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+fi
--- a/autoinstall/t-flex-cad2d+17
+++ b/autoinstall/t-flex-cad2d+17
@ -0,0 +1,89 @@
+#!/usr/bin/env bash
+# info_ru: Профессиональная САПР, объединяющая в себе мощные параметрические возможности 2D и 3D-моделирования со средствами создания и оформления чертежей и конструкторской документации по ЕСКД.
+########################################################################
+export PROG_NAME="T-FLEX CAD 2D+ 17"
+export WH_WINDOWS_VER="10"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export BASE_PFX="tflex17_pfx_x64_v01"
+export WINEARCH="win64"
+export WINEPREFIX="tflex17"
+export PROG_VERSION=""
+export PROG_ICON="tflexcad"
+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"
+
+prepair_wine
+if [[ "$BASE_PFX" == "none" ]] \
+|| ! systemctl list-units --type service --state running | grep aksusbd \
+|| ! 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
+        7z x -y "${AUTOINSTALL_ZIP_LIN}" -o"${AUTOINSTALL_DIR_LIN}"
+        try_remove_file "$AUTOINSTALL_ZIP_LIN"
+        "$WINELOADER" regedit "${AUTOINSTALL_EXE_LIN1}"
+    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
+            7z x -y "${AUTOINSTALL_ZIP_WIN}" -o"${AUTOINSTALL_DIRWIN}"
+            try_remove_file "$AUTOINSTALL_ZIP_WIN"
+
+            7z x -y "${AUTOINSTALL_EXE_WIN1}" -o"${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
+        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"
+
+        "$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 \
+    && systemctl list-units --type service --state running | grep hasplmd
+    then
+        print_info "Службы aksusbd и hasplmd уже запущены. Пропускаем..."
+    else
+        echo "#!/usr/bin/env bash
+        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
+        su_run "${WH_TMP_DIR}/tflex17_aksusbd.sh"
+        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
+
+# Программа T-FLEX CAD 2D+ 17
+export AUTOINSTALL_ZIP="${WH_TMP_DIR}/T-FLEX CAD 2D+ 17.zip"
+export AUTOINSTALL_DIR="${WH_TMP_DIR}"
+export AUTOINSTALL_EXE="${WH_TMP_DIR}/T-FLEX CAD 2D+ 17/T-FLEX CAD 2D+ 17.msi"
+
+if try_download "https://www.tflex.ru/downloads/T-FLEX%20CAD%202D+%2017.zip" "${AUTOINSTALL_ZIP}" ; then
+    7z x -y "${AUTOINSTALL_ZIP}" -o"${AUTOINSTALL_DIR}"
+    try_remove_file "${AUTOINSTALL_ZIP}"
+
+    wine_run_install "${AUTOINSTALL_EXE}" /q
+    try_remove_file "${AUTOINSTALL_EXE}"
+
+    WIN_FILE_EXEC="$DRIVE_C/Program Files/T-FLEX CAD 2D+ 17/Program/TFlexCad.exe"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+fi
--- a/autoinstall/t-flex-viewer17
+++ b/autoinstall/t-flex-viewer17
@ -0,0 +1,89 @@
+#!/usr/bin/env bash
+# info_ru: Просмотр, печать и аннотирование документов T-FLEX CAD
+########################################################################
+export PROG_NAME="T-FLEX Viewer 17"
+export WH_WINDOWS_VER="10"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export BASE_PFX="tflex17_pfx_x64_v01"
+export WINEARCH="win64"
+export WINEPREFIX="tflex17"
+export PROG_VERSION=""
+export PROG_ICON="tflexcad"
+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"
+
+prepair_wine
+if [[ "$BASE_PFX" == "none" ]] \
+|| ! systemctl list-units --type service --state running | grep aksusbd \
+|| ! 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
+        7z x -y "${AUTOINSTALL_ZIP_LIN}" -o"${AUTOINSTALL_DIR_LIN}"
+        try_remove_file "$AUTOINSTALL_ZIP_LIN"
+        "$WINELOADER" regedit "${AUTOINSTALL_EXE_LIN1}"
+    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
+            7z x -y "${AUTOINSTALL_ZIP_WIN}" -o"${AUTOINSTALL_DIRWIN}"
+            try_remove_file "$AUTOINSTALL_ZIP_WIN"
+
+            7z x -y "${AUTOINSTALL_EXE_WIN1}" -o"${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
+        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"
+
+        "$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 \
+    && systemctl list-units --type service --state running | grep hasplmd
+    then
+        print_info "Службы aksusbd и hasplmd уже запущены. Пропускаем..."
+    else
+        echo "#!/usr/bin/env bash
+        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
+        su_run "${WH_TMP_DIR}/tflex17_aksusbd.sh"
+        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
+
+# Программа T-FLEX Viewer
+export AUTOINSTALL_ZIP="${WH_TMP_DIR}/T-FLEX Viewer 17.zip"
+export AUTOINSTALL_DIR="${WH_TMP_DIR}"
+export AUTOINSTALL_EXE="${WH_TMP_DIR}/T-FLEX Viewer 17/T-FLEX Viewer 17.msi"
+
+if try_download "https://www.tflex.ru/downloads/T-FLEX%20Viewer%2017.zip" "${AUTOINSTALL_ZIP}" ; then
+    7z x -y "${AUTOINSTALL_ZIP}" -o"${AUTOINSTALL_DIR}"
+    try_remove_file "${AUTOINSTALL_ZIP}"
+
+    wine_run_install "${AUTOINSTALL_EXE}" /q
+    try_remove_file "${AUTOINSTALL_EXE}"
+
+    WIN_FILE_EXEC="$DRIVE_C/Program Files/T-FLEX Viewer 17/Program/TFlexViewer.exe"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+fi
--- a/image/daobitcservice.png
+++ b/image/daobitcservice.png
--- a/image/daobitratlas.png
+++ b/image/daobitratlas.png
--- a/image/daobitrinfo.png
+++ b/image/daobitrinfo.png
--- a/image/daobitrtariff.png
+++ b/image/daobitrtariff.png
--- a/manualinstall/daobit-cservice
+++ b/manualinstall/daobit-cservice
@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+# info_ru:  Сервис обновления ПО
+########################################################################
+export WH_WINE_USE="wine_x_tkg_10-0_i586" # wine-9.0.9-alt1-i586"
+export WINEPREFIX="daobit"
+export PROG_NAME="Сервис обновления ПО"
+export PROG_ICON="daobitcservice"
+export BASE_PFX="daobit_pfx_x86_v01"
+export WH_WINDOWS_VER="10"
+export WINEARCH="win32"
+export INSTALL_DLL="dotnet7 dotnetdesktop7 arial renderer=gdi"
+AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_cs"
+AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_cs/SETUP.EXE"
+EXE_SETUP_NAME="setup_cs.exe"
+
+if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then
+    prepair_wine
+
+    7z x -y "$2" -o"${AUTOINSTALL_UNPACK}"
+    wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\DAO\\\\CSERVICE" /auto /hide
+
+    WIN_FILE_EXEC="$DRIVE_C/Program Files/DAO/CSERVICE/daoservc.exe"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+    try_remove_dir "$AUTOINSTALL_UNPACK"
+else
+    fatal "Не найден файл установки для $PROG_NAME. Перезапустите по примеру:
+    winehelper install $1 \"/путь/до/$EXE_SETUP_NAME\""
+fi
--- a/manualinstall/daobit-ratlas
+++ b/manualinstall/daobit-ratlas
@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+# info_ru: Построение маршрутов железнодорожных грузоперевозок
+########################################################################
+export WH_WINE_USE="wine_x_tkg_10-0_i586" # wine-9.0.9-alt1-i586"
+export WINEPREFIX="daobit"
+export PROG_NAME="R-Атлас"
+export PROG_ICON="daobitratlas"
+export BASE_PFX="none"
+export WH_WINDOWS_VER="10"
+export WINEARCH="win32"
+export INSTALL_DLL="dotnet7 dotnetdesktop7 arial renderer=gdi"
+AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_rk"
+AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_rk/setup.exe"
+EXE_SETUP_NAME="setup_rk.exe"
+
+if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then
+    prepair_wine
+
+    7z x -y "$2" -o"${AUTOINSTALL_UNPACK}"
+    wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\DAO\\\\RAtlas" /auto /hide
+
+    WIN_FILE_EXEC="$DRIVE_C/Program Files/DAO/RAtlas/ratlas.exe"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+    try_remove_dir "$AUTOINSTALL_UNPACK"
+else
+    fatal "Не найден файл установки для $PROG_NAME. Перезапустите по примеру:
+    winehelper install $1 \"/путь/до/$EXE_SETUP_NAME\""
+fi
--- a/manualinstall/daobit-rinfo
+++ b/manualinstall/daobit-rinfo
@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+# info_ru: Специализированная информация для организации железнодорожных перевозок
+########################################################################
+export WH_WINE_USE="wine_x_tkg_10-0_i586" # wine-9.0.9-alt1-i586"
+export WINEPREFIX="daobit"
+export PROG_NAME="R-Инфо"
+export PROG_ICON="daobitrinfo"
+export BASE_PFX="daobit_pfx_x86_v01"
+export WH_WINDOWS_VER="10"
+export WINEARCH="win32"
+export INSTALL_DLL="dotnet7 dotnetdesktop7 arial renderer=gdi"
+AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_ri"
+AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_ri/setup.exe"
+EXE_SETUP_NAME="setup_ri.exe"
+
+if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then
+    prepair_wine
+
+    7z x -y "$2" -o"${AUTOINSTALL_UNPACK}"
+    wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\DAO\\\\RInfo" /auto /hide
+
+    WIN_FILE_EXEC="$DRIVE_C/Program Files/DAO/RInfo/rinfo.exe"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+    try_remove_dir "$AUTOINSTALL_UNPACK"
+else
+    fatal "Не найден файл установки для $PROG_NAME. Перезапустите по примеру:
+    winehelper install $1 \"/путь/до/$EXE_SETUP_NAME\""
+fi
--- a/manualinstall/daobit-rtariff
+++ b/manualinstall/daobit-rtariff
@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+# info_ru:  Расчёт размера провозной платы и дополнительных сборов за грузовые перевозки по железной дороге
+########################################################################
+export WH_WINE_USE="wine_x_tkg_10-0_i586" # wine-9.0.9-alt1-i586"
+export WINEPREFIX="daobit"
+export PROG_NAME="R-Тариф"
+export PROG_ICON="daobitrtariff"
+export BASE_PFX="daobit_pfx_x86_v01"
+export WH_WINDOWS_VER="10"
+export WINEARCH="win32"
+export INSTALL_DLL="dotnet7 dotnetdesktop7 arial renderer=gdi"
+AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_rt"
+AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_rt/setup.exe"
+EXE_SETUP_NAME="setup_rt.exe"
+
+if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then
+    prepair_wine
+
+    7z x -y "$2" -o"${AUTOINSTALL_UNPACK}"
+    wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\DAO\\\\RTariff" /auto /hide
+
+    WIN_FILE_EXEC="$DRIVE_C/Program Files/DAO/RTariff/Tariff.exe"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+    try_remove_dir "$AUTOINSTALL_UNPACK"
+else
+    fatal "Не найден файл установки для $PROG_NAME. Перезапустите по примеру:
+    winehelper install $1 \"/путь/до/$EXE_SETUP_NAME\""
+fi
--- a/sha256sum.list
+++ b/sha256sum.list
@ -59,3 +59,7 @@ d026d799f8d3893c64c749661240d76896d45fd14fdb6665bf0f875a4a05bcdb  spravkibk_pfx_
 dfb44ce5e5af7dba1686932c63d6b05e5dd6919a21c78130a7d1d0271b93958e  audiorecstation_pfx_v01.tar.xz
 # create with wine_x_tkg_10-0_i586 (universal user: xuser)
 # winetricks gdiplus vcrun2022 xact winhttp dotnet40 dotnet48 andale arial comicsans courier georgia impact times trebuchet verdana webdings corefonts dsound
+
+00516ef51079d68ad0f9621c8270e0f86318539b63ebf1085d0faba36896e4ac  daobit_pfx_x86_v01.tar.xz
+# create with wine_x_tkg_10-0_i586 (universal user: xuser)
+# winetricks arial dotnet7 dotnetdesktop7 renderer=gdi
--- a/109
+++ b/109
@ -647,6 +647,105 @@ init_wine_ver () {
 }

 ##### INITIAL WINEPREFIX SETTINGS #####
+get_and_set_reg_file () {
+    
+    convert_dec_and_hex () {
+        local type=$1
+        local num=$2
+
+        case "$type" in
+            --dec)
+            # Преобразование из десятичного в шестнадцатеричный
+            echo -n "$(printf "%08x" "$num")" ;;
+            --hex)
+            # Преобразование из шестнадцатеричного в десятичный
+            echo $(( 0x$num )) ;;
+            *)
+            echo "Неверный тип преобразования. Используйте --dec или --hex." ;;
+        esac
+        }
+
+    local name_block name_for_find find_block find_file find_line count name_for_new_block name_for_find_old
+    local line_reg find_number_line find_check_file name_for_set name_type_reg name_fatal name_add_or_del
+    name_add_or_del=$1
+    name_block=$2
+    name_for_find=$3
+    name_type_reg=$4
+    name_for_set=$5
+    name_for_new_block=$6
+    name_for_find_old=$name_for_find
+    name_fatal="$name_block $name_for_find"
+
+    case $name_type_reg in
+        REG_DWORD)
+            name_for_find="\"$name_for_find\"=dword:"
+            name_for_set=$(convert_dec_and_hex --dec "$name_for_set") ;;
+        REG_SZ)
+            name_for_find="\"$name_for_find\"="
+            name_for_set="\"$name_for_set\"" ;;
+        *)
+            if [[ $name_add_or_del == --delete ]] ; then
+                name_for_find="\"$name_for_find\""
+            else
+                print_error "не задан тип ветки реестра: $name_fatal"
+                return 1
+            fi ;;
+    esac
+    name_block=${name_block//\\/\\\\\\\\}
+    if [[ -n $name_for_new_block ]] ; then
+        find_block=$(grep -n "\[$name_block\]" "$WINEPREFIX/$name_for_new_block.reg")
+    else
+        find_block=$(grep -n "\[$name_block\]" "$WINEPREFIX/"*.reg)
+    fi
+    if [[ -n $find_block ]] ; then
+        if [[ -n $name_for_new_block ]] ; then
+            find_file="$WINEPREFIX/$name_for_new_block.reg"
+            find_line=${find_block//:*/}
+        else
+            find_file=${find_block//:*/}
+            find_line=${find_block//$find_file:/}
+            find_line=${find_line//:*/}
+        fi
+        count=-1
+        while read -r line_reg ; do
+            ((count++))
+            if [[ $line_reg =~ $name_for_find ]] ; then
+                if [[ $line_reg == $name_for_find$name_for_set ]] ; then
+                    return 0
+                fi
+                find_number_line=$(( count + find_line ))
+                find_check_file=1
+                break
+            fi
+            [[ -z $line_reg ]] && break
+        done <<< "$(sed -n "$find_line"',$p' "$find_file")"
+    fi
+    if [[ $name_add_or_del == --add ]] ; then
+        if [[ -z $find_block ]] ; then
+            if [[ -n $name_for_new_block ]] ; then
+                sed -i '$a\\n'\["$name_block"\] "$WINEPREFIX/$name_for_new_block.reg"
+                find_file="$WINEPREFIX/$name_for_new_block.reg"
+                find_line=$(wc -l "$find_file" | awk -F" " '{print $1}')
+                find_line=$(( find_line - 1 ))
+            else
+                print_error "$name_fatal не найден в файле реестра"
+                return 1
+            fi
+        fi
+        if [[ $find_check_file == 1 ]] ; then
+            print_info "Меняем $name_for_find_old в файле реестра"
+            sed -i "${find_number_line}s|$name_for_find.*|$name_for_find$name_for_set|" "$find_file"
+        else
+            print_info "Добавляем $name_for_find_old в файл реестра"
+            sed -i "$(( find_line + 1 ))a$name_for_find$name_for_set" "$find_file"
+        fi
+    elif [[ $name_add_or_del == --delete ]] ; then
+        [[ $find_check_file != 1 ]] && return 0
+        print_info "Удаляем $name_for_find_old из файла реестра"
+        sed -i "${find_number_line}d" "$find_file"
+    fi
+}
+
 wait_wineserver () {
 #     while [[ -n "$(ls -l /proc/*/exe 2>/dev/null | grep -ie portproton | grep -E 'wine(64)?-preloader|wineserver' | awk -F/ '{print $3}')" ]] ; do
 #         sleep 1
@ -726,6 +825,16 @@ init_wineprefix () {
    fi

    try_remove_file "$DRIVE_C/windows/system32/winemenubuilder.exe"
+
+    # хак для XRDP сессии
+    if [[ $DISPLAY == *:10.0 ]] ; then
+        print_warning "Обнаружена сессия XRDP, настраиваем реестр:"
+        get_and_set_reg_file --add 'Software\Wine\X11 Driver' 'UseXRandR' 'REG_SZ' "N" "user"
+        get_and_set_reg_file --add 'Software\Wine\X11 Driver' 'UseXVidMode' 'REG_SZ' "N" "user"
+    else
+        get_and_set_reg_file --delete 'Software\Wine\X11 Driver' 'UseXRandR'
+        get_and_set_reg_file --delete 'Software\Wine\X11 Driver' 'UseXVidMode'
+    fi
 }

 ##### KILL AUTOSTART AFTER INSTALLING #####
Author	SHA1	Message	Date
Mikhail Tergoev	52ebfab570	updated changelog to 0.3.4	2025-04-14 16:28:24 +03:00
Mikhail Tergoev	d6da611647	added pfx and updated daobit scripts	2025-04-14 16:25:20 +03:00
Mikhail Tergoev	5298f16514	Merge branch 'minergenon-daobit_unpack'	2025-04-14 15:09:09 +03:00
Sergey Palcheh	ecfab64e45	added manualinstall/daobit unpack	2025-04-14 17:28:25 +06:00
Mikhail Tergoev	472c29d876	Merge branch 'minergenon-tflex3prog'	2025-04-14 12:50:02 +03:00
Mikhail Tergoev	7e94f3617b	Merge branch 'minergenon-scadoffice'	2025-04-14 12:49:22 +03:00
Mikhail Tergoev	b9bb948738	added reg func and hack for XRDP	2025-04-14 12:47:19 +03:00
Mikhail Tergoev	b43ca4d712	Merge branch 'minergenon-daobit'	2025-04-11 16:08:55 +03:00
Sergey Palcheh	86040f5efd	added autoinstall/edu,cad2d+,viewer	2025-04-11 16:42:11 +06:00
Sergey Palcheh	e6dc01efc1	added manualinstall daobit	2025-04-10 14:45:51 +06:00