From fcd0bff7f43d1aa1ce8bf1fb73cba3513058efb8 Mon Sep 17 00:00:00 2001 From: castro-fidel Date: Fri, 21 Jan 2022 21:28:11 +0300 Subject: [PATCH] Fix GUI update prefix from portproton --- data_from_portwine/scripts/functions_helper | 3 ++- data_from_portwine/scripts/runlib | 2 +- data_from_portwine/scripts/var | 2 +- portwine_install_script/PortProton-97 | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 08ad4d77..5bd9050f 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -367,7 +367,8 @@ pw_update_pfx_cover_gui () { "${pw_yad_new}" --plug=$PW_KEY_PROGRESS_BAR --tabnum="1" --picture --filename="${PW_GIF_FILE}" --image-on-top & "${pw_yad_new}" --notebook --key="$PW_KEY_PROGRESS_BAR" --tab=LOGO --tab=TERMINAL --no-buttons --undecorated \ - --center --auto-close --skip-taskbar --width=$PW_GIF_SIZE_X --height=$PW_GIF_SIZE_Y --tab-pos=bottom + --center --auto-close --skip-taskbar --width=$PW_GIF_SIZE_X --height=$PW_GIF_SIZE_Y --tab-pos=bottom & + echo "" } pw_start_progress_bar_cs () { diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index eff0c1ca..4665b0df 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -35,7 +35,7 @@ start_portwine () { xrdb -merge "${HOME}/.Xresources" fi - pw_update_pfx_cover_gui & + pw_update_pfx_cover_gui if [[ ! -z "${LD_LIBRARY_PATH}" ]] ; then if [[ -z "`echo ${LD_LIBRARY_PATH} | grep "${WINEDIR}/lib64:${WINEDIR}/lib"`" ]] ; then diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index d7d23872..a7986814 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -32,7 +32,7 @@ export PW_USE_GSTREAMER="1" export WINEPREFIX="${PORT_WINE_PATH}/data/pfx" export WINE_WIN_START="start.exe /i /unix" ###DEFAULT_WINE### -export PW_WINE_USE=PROTON_STEAM +export PW_WINE_USE=PROTON_GE export PW_PLUGINS_VER="_v1" ###WINE_PROTON_STEAM### export PW_STEAM_VER="6.3-8C_PW2" diff --git a/portwine_install_script/PortProton-97 b/portwine_install_script/PortProton-97 index 281450bb..c62ccd6b 100755 --- a/portwine_install_script/PortProton-97 +++ b/portwine_install_script/PortProton-97 @@ -10,7 +10,7 @@ deflink="${HOME}/PortWINE/${portname}" if [ "$(dirname "`readlink -f "$0"`")" == "/usr/bin" ] ; then [ -z "${XDG_DATA_HOME}" ] && export XDG_DATA_HOME="$HOME/.local/share" if [ -f "${XDG_DATA_HOME}/PortWINE/PortProton/data/scripts/start.sh" ] ; then - sh "${XDG_DATA_HOME}/PortWINE/PortProton/data/scripts/start.sh" "$@" + /bin/bash -c "${XDG_DATA_HOME}/PortWINE/PortProton/data/scripts/start.sh" "$@" exit 0 else if [ ! -z "`locale | grep "LANG=ru_RU.UTF-8"`" ] ; then