From 3f2e6f87d3874c189224c8fa61b1a7a9a15daa0d Mon Sep 17 00:00:00 2001
From: Mikhail Tergoev <fidel@altlinux.org>
Date: Mon, 30 Sep 2024 22:11:38 +0300
Subject: [PATCH] STABLE: Scripts version 2360

---
 data_from_portwine/changelog_en                            | 3 +++
 data_from_portwine/changelog_ru                            | 3 +++
 data_from_portwine/scripts/pw_autoinstall/PW_CATSLAUNCHER  | 4 ++--
 .../scripts/pw_autoinstall/{PW_UBC => PW_UBISOFT}          | 1 +
 data_from_portwine/scripts/start.sh                        | 2 +-
 data_from_portwine/scripts/var                             | 7 ++++---
 6 files changed, 14 insertions(+), 6 deletions(-)
 rename data_from_portwine/scripts/pw_autoinstall/{PW_UBC => PW_UBISOFT} (99%)

diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en
index 1220f5a5..4def5c1e 100755
--- a/data_from_portwine/changelog_en
+++ b/data_from_portwine/changelog_en
@@ -2,6 +2,9 @@ You can help us in the development of the project on the website: https://linux-
 ----------------------------------------
 Changelog:
 
+###Scripts version 2360### / stable / Date: 30.09.2024 / Download update size: 4 megabytes
+* HOTFIX: fixed flatpak detection on some systems (thanks to Htylol)
+
 ###Scripts version 2359### / stable / Date: 30.09.2024 / Download update size: 220 megabytes
 * cumulative update to the stable version of PortProton scripts
 
diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru
index c6187356..977ae7fd 100755
--- a/data_from_portwine/changelog_ru
+++ b/data_from_portwine/changelog_ru
@@ -2,6 +2,9 @@
 -----------------------------------------
 История изменений:
 
+###Scripts version 2360### / stable / Дата: 30.09.2024 / Размер скачиваемого обновления: 4 мегабайт
+* HOTFIX: исправлено определение flatpak на некоторых системах (спасибо Htylol)
+
 ###Scripts version 2359### / stable / Дата: 30.09.2024 / Размер скачиваемого обновления: 220 мегабайт
 * кумулятивное обновление стабильной версии скриптов PortProton
 
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_CATSLAUNCHER b/data_from_portwine/scripts/pw_autoinstall/PW_CATSLAUNCHER
index 54889a09..3cf5b52a 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_CATSLAUNCHER
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_CATSLAUNCHER
@@ -3,8 +3,8 @@
 ########################################################################
 export LAUNCH_PARAMETERS=("/q" )
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/CatsLauncher.msi"
-export PW_PREFIX_NAME=DOTNET
-export PW_USE_D3D_EXTRAS=1
+export PW_PREFIX_NAME="DOTNET"
+export PW_USE_D3D_EXTRAS="1"
 export PORTWINE_CREATE_SHORTCUT_NAME="CatsLauncher"
 
 start_portwine
diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_UBC b/data_from_portwine/scripts/pw_autoinstall/PW_UBISOFT
similarity index 99%
rename from data_from_portwine/scripts/pw_autoinstall/PW_UBC
rename to data_from_portwine/scripts/pw_autoinstall/PW_UBISOFT
index 65fa3125..6535c562 100755
--- a/data_from_portwine/scripts/pw_autoinstall/PW_UBC
+++ b/data_from_portwine/scripts/pw_autoinstall/PW_UBISOFT
@@ -4,6 +4,7 @@
 export LAUNCH_PARAMETERS=("/S" "/D=c:\Program Files (x86)\Ubisoft Game Launcher")
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/UbisoftConnectInstaller.exe"
 export PORTWINE_CREATE_SHORTCUT_NAME="Ubisoft Connect"
+
 start_portwine
 if try_download "https://ubistatic3-a.akamaihd.net/orbit/launcher_installer/UbisoftConnectInstaller.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index 79f7b59a..4872a7b7 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -715,7 +715,7 @@ else
     --field="   Battle.net Launcher"!"$PW_GUI_ICON_PATH/battle_net.png"!"":"FBTN" '@bash -c "button_click --normal PW_BATTLE_NET"' \
     --field="   Epic Games Launcher"!"$PW_GUI_ICON_PATH/epicgames.png"!"":"FBTN" '@bash -c "button_click --normal PW_EPIC"' \
     --field="   GoG Galaxy Launcher"!"$PW_GUI_ICON_PATH/gog.png"!"":"FBTN" '@bash -c "button_click --normal PW_GOG"' \
-    --field="   Ubisoft Game Launcher"!"$PW_GUI_ICON_PATH/ubc.png"!"":"FBTN" '@bash -c "button_click --normal PW_UBC"' \
+    --field="   Ubisoft Game Launcher"!"$PW_GUI_ICON_PATH/ubc.png"!"":"FBTN" '@bash -c "button_click --normal PW_UBISOFT"' \
     --field="   EVE Online Launcher"!"$PW_GUI_ICON_PATH/eve.png"!"":"FBTN" '@bash -c "button_click --normal PW_EVE"' \
     --field="   Rockstar Games Launcher"!"$PW_GUI_ICON_PATH/Rockstar.png"!"":"FBTN" '@bash -c "button_click --normal PW_ROCKSTAR"' \
     --field="   Gameforge Client"!"$PW_GUI_ICON_PATH/gameforge.png"!"":"FBTN" '@bash -c "button_click --normal  PW_GAMEFORGE"' \
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index 891fecf8..11a98d3f 100755
--- a/data_from_portwine/scripts/var
+++ b/data_from_portwine/scripts/var
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 #Author: Castro-Fidel (linux-gaming.ru)
-#SCRIPTS_NEXT_VERSION=2359
-#SCRIPTS_STABLE_VERSION=2359
+#SCRIPTS_NEXT_VERSION=2360
+#SCRIPTS_STABLE_VERSION=2360
 ########################################################################
 # export PROTON_USE_XALIA="1"
 export LANGUAGES_LIST="ru es"
@@ -27,7 +27,6 @@ export WINE_WIN_START="start /wait /high /unix"
 export WINE_ALLOW_XIM="0"
 export PW_USE_SHADER_CACHE="1"
 export PW_WINE_CPU_TOPOLOGY="disabled"
-export STAGING_SHARED_MEMORY="1"
 export PW_MESA_GL_VERSION_OVERRIDE="disabled"
 export PW_VKD3D_FEATURE_LEVEL="disabled"
 export PW_FORCE_LARGE_ADDRESS_AWARE="1"
@@ -36,6 +35,8 @@ export PW_USE_US_LAYOUT="0"
 export PW_GPU_USE="disabled"
 export PW_LOCALE_SELECT="disabled"
 export PW_DINPUT_PROTOCOL="0"
+export STAGING_SHARED_MEMORY="1"
+export STAGING_WRITECOPY="0"
 ###GTK_CONFIG###
 # export GTK_DATA_PREFIX=
 # export GTK_THEME="Adwaita:dark"