xpamych/PortWINE
1
0
Fork 0
forked from CastroFidel/PortWINE
Code Pull Requests Activity

added fix changelog for gamescope session

Browse Source
This commit is contained in:
Mikhail Tergoev 2024-09-30 11:01:38 +03:00
parent 37d90fc969
commit 1f29138f86
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data_from_portwine/scripts/functions_helper
View File

@ -1893,12 +1893,12 @@ pw_port_update () {
else else
curl -s --list-only "${URL_FOR_CHANGELOG}/${PW_CHANGELOG_FILE}" | tee "${PORT_WINE_TMP_PATH}/curent_var_ver" curl -s --list-only "${URL_FOR_CHANGELOG}/${PW_CHANGELOG_FILE}" | tee "${PORT_WINE_TMP_PATH}/curent_var_ver"
CHANGLOG_NEWS=$(sed "/Scripts version ${scripts_install_ver}/,$ d" "${PORT_WINE_TMP_PATH}/curent_var_ver" | sed '1,/---/ d' ) CHANGLOG_NEWS=$(sed "/Scripts version ${scripts_install_ver}/,$ d" "${PORT_WINE_TMP_PATH}/curent_var_ver" | sed '1,/---/ d' )
xcsd=$("${pw_yad}" --title "${translations[Update scripts:]} v.(${scripts_install_ver}${BRANCH_VERSION})" --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ "${pw_yad}" --title "${translations[Update scripts:]} v.(${scripts_install_ver}${BRANCH_VERSION})" --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
--form --separator='%%%' --width=1000 --height=500 \ --form --separator='%%%' --width=1000 --height=500 \
--field=":TXT" "${CHANGLOG_NEWS}" \ --field=":TXT" "$(print_wrapped "${CHANGLOG_NEWS}" 100)" \
--button="${translations[DO NOT REMIND ME]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":16 \ --button="${translations[DO NOT REMIND ME]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":16 \
--button="${translations[REMIND ME LATER]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":18 \ --button="${translations[REMIND ME LATER]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":18 \
--button="${translations[UPDATING NOW]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":20 2>/dev/null) --button="${translations[UPDATING NOW]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":20 2>/dev/null
YAD_STATUS="$?" YAD_STATUS="$?"
# --button="${translations[EXIT]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":252 \ # --button="${translations[EXIT]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":252 \

12
data_from_portwine/scripts/start.sh
View File

@ -251,6 +251,13 @@ esac
pw_check_and_download_plugins pw_check_and_download_plugins
if check_flatpak ; then
if check_gamescope_session
then PW_TERM="xterm -fullscreen -bg black -fg white -e"
else PW_TERM="xterm -bg black -fg white -e"
fi
fi
# check skip update # check skip update
if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] ; then if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] ; then
pw_port_update pw_port_update
@ -278,10 +285,6 @@ fi
if check_flatpak ; then if check_flatpak ; then
try_remove_dir "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}" try_remove_dir "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}"
export PW_USE_RUNTIME="0" export PW_USE_RUNTIME="0"
if check_gamescope_session
then PW_TERM="xterm -fullscreen -bg black -fg white -e"
else PW_TERM="xterm -bg black -fg white -e"
fi
else pw_download_libs else pw_download_libs
fi fi
@ -294,6 +297,7 @@ then
fi fi
pw_check_and_download_dxvk_and_vkd3d pw_check_and_download_dxvk_and_vkd3d
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "${USER_CONF}" source "${USER_CONF}"