From b0f830f274a8aeea537ec1c83bf2a0742a841b46 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Wed, 6 Mar 2024 13:24:59 +0300 Subject: [PATCH] Scripts version 2259 --- data_from_portwine/changelog_eng | 3 ++ data_from_portwine/changelog_rus | 3 ++ data_from_portwine/scripts/functions_helper | 36 ++++++++++++++++++--- data_from_portwine/scripts/var | 2 +- 4 files changed, 39 insertions(+), 5 deletions(-) diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index d08fd339..0f93fa78 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,9 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2259### Date: 06.03.2024 / Download update size: 15 megabytes +* The PortProton update feature has been fixed for Steam Deck in Gaming Mode (the current update needs to be installed from desktop mode) + ###Scripts version 2258### Date: 06.03.2024 / Download update size: 15 megabytes * fixed saving complex arguments for an exe file (example: "- /B/TX /lang:01 /tex:1 /spg:50 KingKongTheGame.bf") * added automatic recovery shortcut to the menu for Steam Deck after SteamOS update (it is necessary to launch PP with any other shortcut of any game, or from Gaming Mode) diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 7b33c644..f7dfff26 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,9 @@ ----------------------------------------- История изменений: +###Scripts version 2259### Дата: 06.03.2024 / Размер скачиваемого обновления: 15 мегабайт +* для Steam Deck в режиме Gaming Mode исправлена возможность обновления PortProton (текущее обновление требуется устнановить из режима рабочего стола) + ###Scripts version 2258### Дата: 06.03.2024 / Размер скачиваемого обновления: 15 мегабайт * исправлено сохранение сложных аргументов для exe файла (пример: "- /B /TX /lang:01 /tex:1 /spg:50 KingKongTheGame.bf") * добавлено автовостановление ярлыка в меню для Steam Deck после обновления SteamOS (необходим запуск PP любым другим ярлыком любой игры, или из режима Gaming Mode) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index e32eb5cf..719d7970 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -122,6 +122,11 @@ export -f check_process try_download_no_mirror () { [[ -f "${PW_AUTOINSTALL_EXE}" ]] && try_remove_file "${PW_AUTOINSTALL_EXE}" PW_DOWNLOAD_FILE_NAME="$(basename $2)" + if check_gamescope_session ; then + $PW_TERM curl -f -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" \ + -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$1" -o "$2" + [ "$?" != 0 ] && return 1 || return 0 + fi set -o pipefail curl -f -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$1" -o "$2" 2>&1 | \ tr '\r' '\n' | sed -ur 's|[# ]+||g;s|.*=.*||g;s|.*|#Downloading at &\n&|g' | \ @@ -139,6 +144,13 @@ try_download_no_mirror () { try_download () { PW_DOWNLOAD_FILE_NAME="$(basename $1)" + if check_gamescope_session ; then + $PW_TERM curl -f -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" \ + -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$1" -o "$2" + # $PW_TERM curl -f -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" \ + # -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "ftp://171.22.215.18/archives/${PW_DOWNLOAD_FILE_NAME}" -o "$2" + return 0 + fi [[ ! -f "${pw_yad_v12_3}" ]] && local pw_yad_v12_3="yad" set -o pipefail curl -f -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$1" -o "$2" 2>&1 | \ @@ -166,8 +178,14 @@ try_download () { try_download_to_path () { PW_DOWNLOAD_FILE_NAME="$(basename $1)" + if check_gamescope_session ; then + $PW_TERM curl -f -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" \ + -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$1" -o "$2/$PW_DOWNLOAD_FILE_NAME" + [ "$?" != 0 ] && return 1 || return 0 + fi set -o pipefail - curl -f -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$1" -o "$2/$PW_DOWNLOAD_FILE_NAME" 2>&1 | \ + curl -f -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -H 'Cache-Control: no-cache, no-store' \ + -H 'Pragma: no-cache' -L "$1" -o "$2/$PW_DOWNLOAD_FILE_NAME" 2>&1 | \ tr '\r' '\n' | sed -ur 's|[# ]+||g;s|.*=.*||g;s|.*|#Downloading at &\n&|g' | \ "${pw_yad_v12_3}" --progress --percentage=0 --text="${loc_downloading} ${PW_DOWNLOAD_FILE_NAME}" --auto-close --no-escape \ --auto-kill --center --text-align="center" --fixed --no-buttons --title "PortProton" --width=500 --height=90 \ @@ -258,9 +276,19 @@ check_start_from_steam () { } check_gamescope_session () { - if echo "${DESKTOP_SESSION}" | grep -i "gamescope" &>/dev/null - then return 0 - else return 1 + if [[ ! -z "$GAMESCOPE_IN_USE" ]] + then [[ "$GAMESCOPE_IN_USE" == 1 ]] && return 0 || return 1 + fi + if echo "${DESKTOP_SESSION}" | grep -i "gamescope" &>/dev/null ; then + if command -v konsole &>/dev/null + then export PW_TERM="konsole --hide-menubar --fullscreen -e" + else export PW_TERM="xdg-terminal" + fi + export GAMESCOPE_IN_USE=1 + return 0 + else + export GAMESCOPE_IN_USE=0 + return 1 fi } diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 25ee5a11..cf07b781 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2258 +#SCRIPTS_NEXT_VERSION=2259 ######################################################################## export PW_MANGOHUD="0" export DEFAULT_MANGOHUD_CONFIG="cpu_stats,cpu_temp,cpu_mhz,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,vram,ram,frame_timing=1,time,arch,wine,toggle_hud=Shift_R+F12,resolution,vkbasalt,gamemode"