From ac4dd4f0bf6961eeaa98eac85c028878a31ddbc2 Mon Sep 17 00:00:00 2001
From: Mikhail Tergoev <fidel@altlinux.org>
Date: Fri, 10 Oct 2025 11:25:16 +0300
Subject: [PATCH] fixed scadoffice scripts and updated prefix

---
 autoinstall/scadoffice | 44 ++++++++++++++++++++----------------------
 sha256sum.list         |  7 ++++---
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/autoinstall/scadoffice b/autoinstall/scadoffice
index db067e8..cb652b3 100644
--- a/autoinstall/scadoffice
+++ b/autoinstall/scadoffice
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
-# info_ru: SCAD Office — это программный комплекс для расчёта строительных конструкций, с дополнением Apache OpenOffice. Apache OpenOffice - пакет офисного программного обеспечения для обработки текстов, электронных таблиц, презентаций, графики, баз данных и многого другого.
+# info_ru: SCAD Office — это программный комплекс для расчёта строительных конструкций.
 ########################################################################
 export PROG_URL="https://scadoffice.ru"
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="scadoffice"
 export PROG_NAME="SCAD Office"
 export PROG_ICON="scadoffice"
-export BASE_PFX="scadaoffice_pfx_x64_v04"
+export BASE_PFX="scadaoffice_pfx_x64_v05"
 export WH_WINDOWS_VER="10"
 export WINEARCH="win64"
 export INSTALL_DLL="dotnet20 dotnet48 gdiplus vcrun6sp6 vcrun2005 vcrun2019 d3dx11_42 d3dx11_43 d3dx9 d3dcompiler_42 d3dcompiler_43 d3dcompiler_46 d3dcompiler_47 richtx32 riched30 riched20 msxml6"
@@ -32,33 +32,31 @@ if [[ -n $2 ]] ; then
     fi
 fi
 
-if [[ $BASE_PFX == "none" ]] ; then
-    print_info "Установка дополнительных компонентов..."
+print_info "Установка дополнительных компонентов..."
 
-    ADDONS_PACK="${WH_TMP_DIR}/$(basename "$SCADOFFICE_ADDONS_URL")"
-    ADDONS_PATH="${WH_TMP_DIR}/scadoffice_addons"
+ADDONS_PACK="${WH_TMP_DIR}/$(basename "$SCADOFFICE_ADDONS_URL")"
+ADDONS_PATH="${WH_TMP_DIR}/scadoffice_addons"
 
-    ADDONS_PATH_REG="${ADDONS_PATH}/REG"
-    ADDONS_PATH_MDAC="${ADDONS_PATH}/mdac64"
-    ADDONS_PATH_OPENSSH="${ADDONS_PATH}/OpenSSH"
+ADDONS_PATH_REG="${ADDONS_PATH}/REG"
+ADDONS_PATH_MDAC="${ADDONS_PATH}/mdac64"
+ADDONS_PATH_OPENSSH="${ADDONS_PATH}/OpenSSH"
 
-    if try_download "$SCADOFFICE_ADDONS_URL" "${ADDONS_PACK}" ; then
-        create_new_dir "${ADDONS_PATH}"
-        unpack "${ADDONS_PACK}" "${ADDONS_PATH}"
-        wine_run regedit "${ADDONS_PATH_REG}"/*.reg
+if try_download "$SCADOFFICE_ADDONS_URL" "${ADDONS_PACK}" ; then
+    create_new_dir "${ADDONS_PATH}"
+    unpack "${ADDONS_PACK}" "${ADDONS_PATH}"
+    wine_run regedit "${ADDONS_PATH_REG}"/*.reg
 
-        # Установка ODBC
-        rm -fR "$DRIVE_C/Program Files (x86)/Common Files/System"
-        cp -r "${ADDONS_PATH_MDAC}/System" "$DRIVE_C/Program Files (x86)/Common Files/System"
-        cp -r "${ADDONS_PATH_MDAC}"/*.* "$DRIVE_C/windows/system32/"
-        wine_run regedit "${ADDONS_PATH_MDAC}"/*.reg
+    # Установка ODBC
+    rm -fR "$DRIVE_C/Program Files (x86)/Common Files/System"
+    cp -r "${ADDONS_PATH_MDAC}/System" "$DRIVE_C/Program Files (x86)/Common Files/System"
+    cp -r "${ADDONS_PATH_MDAC}"/*.* "$DRIVE_C/windows/system32/"
+    wine_run regedit "${ADDONS_PATH_MDAC}"/*.reg
 
-        # Установка SSH
-        cp -r "${ADDONS_PATH_OPENSSH}" "$DRIVE_C/windows/system32/"
+    # Установка SSH
+    cp -r "${ADDONS_PATH_OPENSSH}" "$DRIVE_C/windows/system32/"
 
-        try_remove_dir "$ADDONS_PATH"
-        try_remove_file "$ADDONS_PACK"
-    fi
+    try_remove_dir "$ADDONS_PATH"
+    try_remove_file "$ADDONS_PACK"
 fi
 
 if try_download "https://scadhelp.ru/files/10/download" "${AUTOINSTALL_EXE}" ; then
diff --git a/sha256sum.list b/sha256sum.list
index 718968f..a7418d1 100644
--- a/sha256sum.list
+++ b/sha256sum.list
@@ -208,10 +208,11 @@ dfb44ce5e5af7dba1686932c63d6b05e5dd6919a21c78130a7d1d0271b93958e  audiorecstatio
 # create with wine_x_tkg_10-0_i586 (universal user: xuser)
 # winetricks arial dotnet7 dotnetdesktop7 renderer=gdi
 
-4fa93434c5c15440014357323257ddcee7d28b94ad6a56bd6f5a08b33ae4c3cb  scadaoffice_pfx_x64_v04.tar.xz
-# create with wine-8.8-staging-amd64
+8c6312f2e4e846a98ca4a87fc90ee1917eb28d4caaddde040fb4d2dd05f8c0fe  scadaoffice_pfx_x64_v05.tar.xz
+# create with wine_x_tkg_10-0_amd64 (universal user: xuser)
 # winetricks dotnet48 gdiplus vcrun6sp6 vcrun2005 vcrun2019 d3dx11_42 d3dx11_43 d3dx9 d3dcompiler_42 d3dcompiler_43 d3dcompiler_46 d3dcompiler_47 richtx32 riched30 riched20 msxml6 dotnet20
-# + addons with ODBC, SSH, *.reg
+
+# addons with ODBC, SSH, *.reg
 0f4ef434df07bc338ae308af44330590eaa1d9c94b64850514e55b960642d0eb  scadoffice_addons_v02.tar.xz
 
 ef7e8f1ba785d48e4ea287feed5b79bd630d423e59efadb43da9653adefef218  ais-lpu-client_pfx_x86_v01.tar.xz