From 03eed7ac387b427ad9427bec03863642e3d7f30c Mon Sep 17 00:00:00 2001
From: Mikhail Tergoev <fidel@altlinux.org>
Date: Sun, 9 Jun 2024 14:04:06 +0300
Subject: [PATCH] moved yad portable to scripts path

---
 data_from_portwine/scripts/functions_helper | 3 +--
 data_from_portwine/scripts/start.sh         | 1 +
 data_from_portwine/scripts/var              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index 1a52138..fb70065 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -1016,7 +1016,7 @@ pw_check_and_download_dxvk_and_vkd3d () {
 }
 
 pw_check_and_download_plugins () {
-    if [[ ! -f "${PW_PLUGINS_PATH}/portable/bin/$PW_YAD_BIN" ]] ; then
+    if [[ ! -f "${PW_PLUGINS_PATH}/portable/lib/lib64/libvkbasalt.so" ]] ; then
         print_info "Download and install plugins${PW_PLUGINS_VER}..."
         if command -v yad &>/dev/null ; then
             if try_download "github.com/Castro-Fidel/wine_builds/releases/download/plugins${PW_PLUGINS_VER}/plugins${PW_PLUGINS_VER}.tar.xz" "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz" ; then
@@ -1071,7 +1071,6 @@ pw_check_and_download_plugins () {
             fi
         fi
     fi
-    export pw_yad="${PW_PLUGINS_PATH}/portable/bin/$PW_YAD_BIN"
     if command -v 7z &>/dev/null
     then export pw_7z="7z"
     else export pw_7z="${PW_PLUGINS_PATH}/portable/lib/p7zip/7z"
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index cb7b981..01ff95d 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -119,6 +119,7 @@ cd "${PORT_SCRIPTS_PATH}" || fatal
 
 # shellcheck source=./var
 source "${PORT_SCRIPTS_PATH}/var"
+export pw_yad="${PORT_WINE_PATH}/data/scripts/yad_portable/$PW_YAD_BIN"
 
 export STEAM_SCRIPTS="${PORT_WINE_PATH}/steam_scripts"
 export PW_PLUGINS_PATH="${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}"
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index 1582745..0497636 100755
--- a/data_from_portwine/scripts/var
+++ b/data_from_portwine/scripts/var
@@ -37,7 +37,7 @@ export PW_GPU_USE="disabled"
 export PW_LOCALE_SELECT="disabled"
 export PW_USE_GAMESCOPE="0"
 export PW_DINPUT_PROTOCOL="0"
-export PW_YAD_BIN="yad_v13_0_2"
+export PW_YAD_BIN="yad_v13_0_3"
 ###GTK_CONFIG###
 # export GTK_DATA_PREFIX=
 # export GTK_THEME="Adwaita:dark"