Commit 03eed7ac authored by Mikhail Tergoev's avatar Mikhail Tergoev

moved yad portable to scripts path

parent fc1dc176
...@@ -1016,7 +1016,7 @@ pw_check_and_download_dxvk_and_vkd3d () { ...@@ -1016,7 +1016,7 @@ pw_check_and_download_dxvk_and_vkd3d () {
} }
pw_check_and_download_plugins () { 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}..." print_info "Download and install plugins${PW_PLUGINS_VER}..."
if command -v yad &>/dev/null ; then 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 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 () { ...@@ -1071,7 +1071,6 @@ pw_check_and_download_plugins () {
fi fi
fi fi
fi fi
export pw_yad="${PW_PLUGINS_PATH}/portable/bin/$PW_YAD_BIN"
if command -v 7z &>/dev/null if command -v 7z &>/dev/null
then export pw_7z="7z" then export pw_7z="7z"
else export pw_7z="${PW_PLUGINS_PATH}/portable/lib/p7zip/7z" else export pw_7z="${PW_PLUGINS_PATH}/portable/lib/p7zip/7z"
......
...@@ -119,6 +119,7 @@ cd "${PORT_SCRIPTS_PATH}" || fatal ...@@ -119,6 +119,7 @@ cd "${PORT_SCRIPTS_PATH}" || fatal
# shellcheck source=./var # shellcheck source=./var
source "${PORT_SCRIPTS_PATH}/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 STEAM_SCRIPTS="${PORT_WINE_PATH}/steam_scripts"
export PW_PLUGINS_PATH="${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}" export PW_PLUGINS_PATH="${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}"
......
...@@ -37,7 +37,7 @@ export PW_GPU_USE="disabled" ...@@ -37,7 +37,7 @@ export PW_GPU_USE="disabled"
export PW_LOCALE_SELECT="disabled" export PW_LOCALE_SELECT="disabled"
export PW_USE_GAMESCOPE="0" export PW_USE_GAMESCOPE="0"
export PW_DINPUT_PROTOCOL="0" export PW_DINPUT_PROTOCOL="0"
export PW_YAD_BIN="yad_v13_0_2" export PW_YAD_BIN="yad_v13_0_3"
###GTK_CONFIG### ###GTK_CONFIG###
# export GTK_DATA_PREFIX= # export GTK_DATA_PREFIX=
# export GTK_THEME="Adwaita:dark" # export GTK_THEME="Adwaita:dark"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment