From ace00616ca80dec3021520623cdf67be2af13d39 Mon Sep 17 00:00:00 2001
From: Mikhail Tergoev <fidel@altlinux.org>
Date: Tue, 27 May 2025 16:29:13 +0300
Subject: [PATCH] updated autoinstall: scadoffice

---
 autoinstall/scadoffice | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/autoinstall/scadoffice b/autoinstall/scadoffice
index 5c04b9f..d8b7553 100644
--- a/autoinstall/scadoffice
+++ b/autoinstall/scadoffice
@@ -3,13 +3,16 @@
 ########################################################################
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="scadoffice"
-export BASE_PFX="scadaoffice_pfx_x64_v01"
+export BASE_PFX="scadaoffice_pfx_x64_v03"
 export WH_WINDOWS_VER="10"
 export WINEARCH="win64"
-export INSTALL_DLL="dotnet48 gdiplus vcrun6sp6 vcrun2005 vcrun2019 d3dx11_42 d3dx11_43 d3dx9 d3dcompiler_42 d3dcompiler_43 d3dcompiler_46 d3dcompiler_47 richtx32 riched30 riched20 msxml6 dotnet20"
+export INSTALL_DLL="dotnet20 dotnet472 dotnet48 gdiplus vcrun6sp6 vcrun2005 vcrun2019 d3dx11_42 d3dx11_43 d3dx9 d3dcompiler_42 d3dcompiler_43 d3dcompiler_46 d3dcompiler_47 richtx32 riched30 riched20 msxml6"
+export WH_XDG_OPEN="rtf"
 AUTOINSTALL_EXE="${WH_TMP_DIR}/SCADOffice_installer.exe"
+SCADOFFICE_ADDONS_URL="https://cloud.linux-gaming.ru/portproton/scadoffice_addons_v02.tar.xz"
 
 prepair_wine
+
 DRIVE_C_SCADOFFICE="$DRIVE_C/SCAD Soft/SCADOffice/64"
 
 if [[ -n $2 ]] ; then
@@ -29,21 +32,16 @@ fi
 if [[ $BASE_PFX == "none" ]] ; then
     print_info "Установка дополнительных компонентов..."
 
-    ADDONS_PACK="${WH_TMP_DIR}/scadoffice_addons_v01.tar.xz"
+    ADDONS_PACK="${WH_TMP_DIR}/$(basename "$SCADOFFICE_ADDONS_URL")"
     ADDONS_PATH="${WH_TMP_DIR}/scadoffice_addons"
-    OFFICE_EXE="${ADDONS_PATH}/OpenOffice.exe"
-    OFFICE_PACK="${ADDONS_PATH}/OpenOffice"
-    AUTOINSTALL_SETUP="${ADDONS_PATH}/OpenOffice/setup.exe"
+
     ADDONS_PATH_REG="${ADDONS_PATH}/REG"
     ADDONS_PATH_MDAC="${ADDONS_PATH}/mdac64"
     ADDONS_PATH_OPENSSH="${ADDONS_PATH}/OpenSSH"
 
-    if try_download "https://cloud.linux-gaming.ru/portproton/scadoffice_addons_v01.tar.xz" "${ADDONS_PACK}" ; then
+    if try_download "$SCADOFFICE_ADDONS_URL" "${ADDONS_PACK}" ; then
         create_new_dir "${ADDONS_PATH}"
         unpack "${ADDONS_PACK}" "${ADDONS_PATH}"
-        7z x -y "${OFFICE_EXE}" -o"${OFFICE_PACK}"
-        wine_run_install "${AUTOINSTALL_SETUP}" /qn
-
         wine_run regedit "${ADDONS_PATH_REG}"/*.reg
 
         # Установка ODBC
@@ -73,12 +71,8 @@ if try_download "https://scadhelp.ru/files/10/download" "${AUTOINSTALL_EXE}" ; t
 
     declare -a WIN_FILE_EXEC=("${DRIVE_C_SCADOFFICE}/Arbat.exe" "${DRIVE_C_SCADOFFICE}/West.exe" "${DRIVE_C_SCADOFFICE}/GlobalSettings.exe" "${DRIVE_C_SCADOFFICE}/Decor.exe" "${DRIVE_C_SCADOFFICE}/ReBar.exe" "${DRIVE_C_SCADOFFICE}/UnderGround.exe" "${DRIVE_C_SCADOFFICE}/ComeIn.exe" "${DRIVE_C_SCADOFFICE}/CoCon.exe" "${DRIVE_C_SCADOFFICE}/Comet2.exe" "${DRIVE_C_SCADOFFICE}/Section.exe" "${DRIVE_C_SCADOFFICE}/Consul.exe" "${DRIVE_C_SCADOFFICE}/ConfigProtection.exe" "${DRIVE_C_SCADOFFICE}/Kristall.exe" "${DRIVE_C_SCADOFFICE}/Cross.exe" "${DRIVE_C_SCADOFFICE}/Kust2.exe" "${DRIVE_C_SCADOFFICE}/Magnum.exe" "${DRIVE_C_SCADOFFICE}/Monolit.exe" "${DRIVE_C_SCADOFFICE}/Slope.exe" "${DRIVE_C_SCADOFFICE}/Pasternak.exe" "${DRIVE_C_SCADOFFICE}/UCalc.exe" "${DRIVE_C_SCADOFFICE}/ViewProf.exe" "${DRIVE_C_SCADOFFICE}/SCalc.exe" "${DRIVE_C_SCADOFFICE}/AccelEdit.exe" "${DRIVE_C_SCADOFFICE}/BetaEdit.exe" "${DRIVE_C_SCADOFFICE}/MaterialsEdit.exe" "${DRIVE_C_SCADOFFICE}/Tonus.exe" "${DRIVE_C_SCADOFFICE}/Sezam.exe" "${DRIVE_C_SCADOFFICE}/SCADX.exe")
 
-    # Цикл создания десктоп файлов для scad office в каталог SCADOFFICE на рабочемм столе
+    # Цикл создания десктоп файлов для scad office
     for i in "${!PROG_NAME[@]}"; do
         create_desktop "${PROG_NAME[i]}" "${WIN_FILE_EXEC[i]}" "${PROG_ICON[i]}" "nocopy"
     done
-
-    # Cоздание десктоп файла для openoffice
-    WIN_FILE_EXEC1="$DRIVE_C/Program Files (x86)/OpenOffice 4/program/soffice.exe"
-    create_desktop "OpenOffice" "$WIN_FILE_EXEC1" "openoffice" "nocopy"
 fi