fixed create symlink from xuser to user

rever wine_x_tkg_10-0_amd64 for scadoffice
updated wine and pfx for scadoffice
2025-09-23 17:31:51 +03:00 · 2025-09-23 17:30:53 +03:00 · 2025-09-23 16:40:54 +03:00 · 2025-09-23 16:34:39 +03:00
3 changed files with 12 additions and 6 deletions
--- a/autoinstall/scadoffice
+++ b/autoinstall/scadoffice
@@ -6,10 +6,10 @@ 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_v03"
+export BASE_PFX="scadaoffice_pfx_x64_v04"
 export WH_WINDOWS_VER="10"
 export WINEARCH="win64"
-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 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"
 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"
--- a/sha256sum.list
+++ b/sha256sum.list
@@ -5,6 +5,7 @@
 fb7fdfde96de10a1b3b051bdf2727b6a7c1768b878483726454dd6726e9e0193  wine-9.0.14-alt1-i586-spravkibk.tar.xz
 e0a84bb4908c3927954d7eef6b8ac7212e442b8c107d000c6890fec340f96183  wine-9.0.14-alt1-amd64.tar.xz
 6f86d2220b65b709bf88c6f829a4998de3b929cc2091cd1333a51c32e1491b79  wine-9.0.9-alt1-i586.tar.xz
+f1bf1261550ca2928cefacdb724926d3d6d103433d0ff6882ee9783a50d8f4e4  wine-8.8-staging-amd64.tar.xz
 61bec1230b37b8fcc69fd45f848b44fd88cc41fcdd5dc3080336d7da63660f40  wine-7.16.1-alt1-amd64.tar.xz
 6fea17fd131f57c2ebf7ca4c60d3c5a9e819afe16e5d0b77ecb750da99ae0e38  wine-7.16.1-alt1-i586.tar.xz

@@ -211,8 +212,8 @@ dfb44ce5e5af7dba1686932c63d6b05e5dd6919a21c78130a7d1d0271b93958e  audiorecstatio
 # create with wine_x_tkg_10-0_i586 (universal user: xuser)
 # winetricks arial dotnet7 dotnetdesktop7 renderer=gdi

-25e277c7afa4a9afc5f013cb05f872c12a7f381c4f0503a423dcacccca9a14c6  scadaoffice_pfx_x64_v03.tar.xz
-# create with wine_x_tkg_10-0_i586 (universal user: xuser)
+4fa93434c5c15440014357323257ddcee7d28b94ad6a56bd6f5a08b33ae4c3cb  scadaoffice_pfx_x64_v04.tar.xz
+# create with wine-8.8-staging-amd64
 # 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
 0f4ef434df07bc338ae308af44330590eaa1d9c94b64850514e55b960642d0eb  scadoffice_addons_v02.tar.xz
--- a/9
+++ b/9
@@ -1111,6 +1111,11 @@ init_wineprefix () {
    export DRIVE_C="$WINEPREFIX/drive_c"
    export XUSER_PATH="$DRIVE_C/users/xuser"

+    if [[ -d "$XUSER_PATH" ]] \
+    && [[ ! -d "$DRIVE_C/users/$USER" ]]
+    then try_force_link_dir "$XUSER_PATH" "$DRIVE_C/users/$USER"
+    fi
+
    if [[ ! -f "$WINEPREFIX/.firstboot" ]] ; then
        create_new_dir "$WINEPREFIX"
        if [[ "$CLEAR_PREFIX" == "1" ]]
@@ -1813,9 +1818,9 @@ create_base_pfx () {
    && [[ ! -L "$users_dir/$USER" ]]
    then
        if [[ -L "$users_dir/xuser" ]]
-        then try_remove_dir "$users_dir/xuser/"
+        then try_remove_dir "$users_dir/xuser"
        fi
-        create_new_dir "$users_dir/xuser/"
+        create_new_dir "$users_dir/xuser"
        cp -fr "$users_dir/$USER"/* "$users_dir/xuser/"
    fi
Author	SHA1	Message	Date
Mikhail Tergoev	c8049efd37	fixed create symlink from xuser to user	2025-09-23 17:31:51 +03:00
Mikhail Tergoev	8eb5a0aa86	rever wine_x_tkg_10-0_amd64 for scadoffice	2025-09-23 17:30:53 +03:00
Mikhail Tergoev	7edc205b66	updated wine and pfx for scadoffice	2025-09-23 16:40:54 +03:00
Mikhail Tergoev	b36cadd54d	fixed copy user dir in create_base_pfx	2025-09-23 16:34:39 +03:00