boost restart PP and update covers

data_from_portwine/changelog_rus

@@ -2,6 +2,8 @@
 -----------------------------------------
 История изменений:
 
+* добавлен приоритет использования системного gamemode если он установлен (спасибо Boria138)
+
 ###Scripts version 2253### Дата: 10.02.2024 / Размер скачиваемого обновления: 8 мегабайт
 * небольшие улучшения для SteamOS
 

data_from_portwine/scripts/functions_helper

@@ -228,7 +228,7 @@ var_vk_istance_layers_config_update () {
     return 0
 }
 
-var_ld_library_path_update() {
+var_ld_library_path_update () {
     if [ ! -z "$LD_LIBRARY_PATH" ]
     then export LD_LIBRARY_PATH="$1:$LD_LIBRARY_PATH"
     else export LD_LIBRARY_PATH="$1"
@@ -245,10 +245,17 @@ pw_notify_send () {
     fi
 }
 
+check_start_from_steam () {
+    if [[ "${START_FROM_STEAM}" == 1 ]]
+    then return 0
+    else return 1
+    fi
+}
+
 unpack_tar_zst () {
     set -o pipefail
     unset PW_ZSTD_PORT
-    pw_start_progress_bar_cover_block "${PW_GUI_ICON_PATH}/covers/pw_loading_cover.gif"
+    pw_start_progress_bar_cover_block "${PW_GUI_ICON_PATH}/covers/unpacking_${update_loc}.gif"
     if  [[ `command -v zstd` ]] &>/dev/null ; then
         tar -I zstd -xhvf "$1" -C "$2"
         pw_stop_progress_bar_cover_block
@@ -265,7 +272,7 @@ unpack_tar_xz () {
         tar -Jxhvf "$1" -C "$2" && return 0 || return 1
     else
         set -o pipefail
-        pw_start_progress_bar_cover_block "${PW_GUI_ICON_PATH}/covers/pw_loading_cover.gif"
+        pw_start_progress_bar_cover_block "${PW_GUI_ICON_PATH}/covers/unpacking_${update_loc}.gif"
         tar -Jxhvf "$1" -C "$2"
         pw_stop_progress_bar_cover_block
         [ "${PIPESTATUS[0]}" != 0 ] && print_error "File $1 unpacking error." && return 1 || return 0
@@ -274,7 +281,7 @@ unpack_tar_xz () {
 
 unpack_tar_gz () {
     set -o pipefail
-    pw_start_progress_bar_cover_block "${PW_GUI_ICON_PATH}/covers/pw_loading_cover.gif"
+    pw_start_progress_bar_cover_block "${PW_GUI_ICON_PATH}/covers/unpacking_${update_loc}.gif"
     tar -xhzvf "$1" -C "$2"
     pw_stop_progress_bar_cover_block
     [ "${PIPESTATUS[0]}" != 0 ] && print_error "File $1 unpacking error." && return 1 || return 0
@@ -282,7 +289,7 @@ unpack_tar_gz () {
 
 unpack_tar () {
     set -o pipefail
-    pw_start_progress_bar_cover_block "${PW_GUI_ICON_PATH}/covers/pw_loading_cover.gif"
+    pw_start_progress_bar_cover_block "${PW_GUI_ICON_PATH}/covers/unpacking_${update_loc}.gif"
     tar -xhvf "$1" -C "$2"
     pw_stop_progress_bar_cover_block
     [ "${PIPESTATUS[0]}" != 0 ] && print_error "File $1 unpacking error." && return 1 || return 0
@@ -347,6 +354,7 @@ pw_reinstall_pp () {
     try_remove_file "${PORT_WINE_TMP_PATH}/scripts_ver"
     echo
     print_info "Restarting PP for reinstall files..."
+    export SKIP_CHECK_UPDATES=1
     /usr/bin/env bash -c ${pw_full_command_line[*]} &
     exit 0
 }
@@ -429,7 +437,7 @@ init_wine_ver () {
             if check_symlink "${WINEDIR}/share/wine/${mono_gecko_chk}" ; then
                 print_info "${WINEDIR}/share/wine/${mono_gecko_chk} is symlink. OK."
             elif [[ -d "${WINEDIR}/share/wine/${mono_gecko_chk}" ]] ; then
-                pw_start_progress_bar_cover_block "${PW_GUI_ICON_PATH}/covers/pw_loading_cover.gif" 
+                pw_start_progress_bar_cover_block "${PW_GUI_ICON_PATH}/covers/loading_${update_loc}.gif" 
                 try_copy_dir "${WINEDIR}/share/wine/${mono_gecko_chk}" "${PORT_WINE_TMP_PATH}"
                 try_remove_dir "${WINEDIR}/share/wine/${mono_gecko_chk}"
                 try_force_link_dir "${PORT_WINE_TMP_PATH}/${mono_gecko_chk}" "${WINEDIR}"/share/wine/
@@ -1056,7 +1064,9 @@ pw_port_update () {
                             try_remove_file "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz"
                             try_remove_dir "${PORT_WINE_TMP_PATH}/PortWINE-master/"
                             echo "${scripts_current_ver}" > "${PORT_WINE_TMP_PATH}/scripts_ver"
-                            [ "$?" == 0 ] && echo "Restarting PP after update..." && /usr/bin/env bash -c ${pw_full_command_line[*]} &
+                            echo "Restarting PP after update..."
+                            export SKIP_CHECK_UPDATES=1
+                            /usr/bin/env bash -c ${pw_full_command_line[*]} &
                             exit 0
                         fi
                     else
@@ -1193,6 +1203,7 @@ pw_find_exe () {
     print_var YAD_STATUS
     if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then
         if [[ -z "${PW_SET_FIND_EXE}" ]] ; then
+            export SKIP_CHECK_UPDATES=1
             /usr/bin/env bash -c ${pw_full_command_line[*]} &
             print_info "Restarting..."
         fi
@@ -1203,6 +1214,7 @@ pw_find_exe () {
     if [[ ! -z "${PW_SET_FIND_EXE}" ]] ; then
         portwine_exe="${PW_PATH_FOR_FIND}$(echo "${PW_SET_FIND_EXE}" | awk -F'|' '{print $1}')"
         portwine_create_shortcut silent
+        export SKIP_CHECK_UPDATES=1
         /usr/bin/env bash -c ${pw_full_command_line[*]} &
         exit 0
     fi

data_from_portwine/scripts/runlib

@@ -317,6 +317,7 @@ start_portwine () {
         fi
     else
         export GAMEMODERUN=0
+        export PW_GAMEMODERUN_SLR=""
         print_info "Gamemod is not installed or disabled in vars script or db file: PW_USE_GAMEMODE=$PW_USE_GAMEMODE"
     fi
     pw_other_fixes
@@ -696,10 +697,12 @@ start_portwine () {
         [[ -z "${LAUNCH_PARAMETERS}" ]] && export LAUNCH_PARAMETERS+=" -eac-nop-loaded "
     fi
     pw_stop_progress_bar &&
-    [[ "${START_FROM_STEAM}" != 1 ]] && pw_tray_icon
+    if ! check_start_from_steam ; then
+        pw_tray_icon
         sleep 0.5
         if [[ "${PW_CHECK_AUTOINSTAL}" != "1" ]] ; then
-        pw_start_progress_bar_cover "${PW_GUI_ICON_PATH}/covers/pw_loading_cover.gif"
+            pw_start_progress_bar_cover "${PW_GUI_ICON_PATH}/covers/loading_${update_loc}.gif" 
+        fi
     fi
     add_in_start_portwine
 
@@ -731,7 +734,6 @@ pw_run () {
         echo "Log WINE:" >> "${PW_LOG_TO_FILE}"
         echo ""
         print_debug "Log from RUNTIME and WINE:"
-        if [[ ! -z "$PW_GAMEMODERUN_SLR" ]] ; then
         ${PW_RUN_GAMESCOPE} \
         ${pw_runtime} \
         env PATH="${PATH}" \
@@ -742,17 +744,6 @@ pw_run () {
         ${PW_GAMEMODERUN_SLR} \
         ${PW_MANGOHUD_SLR} \
         "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} &>>"${PW_LOG_TO_FILE}"
-        else
-            ${PW_RUN_GAMESCOPE} \
-            ${pw_runtime} \
-            env PATH="${PATH}" \
-            LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \
-            LD_PRELOAD="${PW_LD_PRELOAD}" \
-            VK_LAYER_PATH="${PW_VK_LAYER_PATH}" \
-            VK_INSTANCE_LAYERS=${PW_VK_INSTANCE_LAYERS} \
-            ${PW_MANGOHUD_SLR} \
-            "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} &>>"${PW_LOG_TO_FILE}"
-        fi
     else
         if [[ "${PW_USE_TERMINAL}" == "1" ]] ; then
             export PW_ADD_TO_ARGS_IN_RUNTIME="--xterm"
@@ -761,7 +752,6 @@ pw_run () {
         echo ""
         echo "Log WINE:" > "${PW_LOG_TO_FILE}"
         print_debug "Log from RUNTIME and WINE:"
-        if [[ ! -z "$PW_GAMEMODERUN_SLR" ]] ; then
         ${PW_RUN_GAMESCOPE} \
         ${pw_runtime} \
         env PATH="${PATH}" \
@@ -774,7 +764,6 @@ pw_run () {
         "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} &>>"${PW_LOG_TO_FILE}"
         cat "${PW_LOG_TO_FILE}"
     fi
-    fi
 }
 export -f pw_run
 
@@ -883,7 +872,10 @@ check_user_conf
 
 if [[ -z "${INSTALLING_PORT}" ]] ; then
     . "${USER_CONF}"
+    if ! check_start_from_steam && [[ "${SKIP_CHECK_UPDATES}" != 1 ]]; then
         pw_port_update
+    fi
+    unset SKIP_CHECK_UPDATES
     pw_check_and_download_plugins
     pw_download_libs
     export PW_VULKANINFO_PORTABLE="$PW_WINELIB/pressure-vessel/libexec/steam-runtime-tools-0/x86_64-linux-gnu-vulkaninfo"

data_from_portwine/scripts/setup.sh

@@ -58,6 +58,7 @@ if [ "${PW_SILENT_INSTALL}" = "1" ] ; then
 			try_remove_file "${HOME}/.local/share/applications/PortProton.desktop"
 		fi
 		echo "Restarting PP after installing..."
+		export SKIP_CHECK_UPDATES=1
 		/usr/bin/env bash -c "${PORT_WINE_PATH}/data/scripts/start.sh" $@ & 
 		exit 0
 	else

data_from_portwine/scripts/start.sh

@@ -27,6 +27,7 @@ killall -15 yad_v12_3 2>/dev/null
 kill -TERM `pgrep -a yad | grep ${portname} | head -n 1 | awk '{print $1}'` 2>/dev/null
 
 if [[ -f "/usr/bin/portproton" ]] && [[ -f "${HOME}/.local/share/applications/PortProton.desktop" ]] ; then
+    export SKIP_CHECK_UPDATES=1
     /usr/bin/env bash "/usr/bin/portproton" "$@" & 
     exit 0
 fi
@@ -490,6 +491,7 @@ pw_edit_db () {
     fi
     if [[ "$?" == 0 ]] ; then
         print_info "Restarting PP after update ppdb file..."
+        export SKIP_CHECK_UPDATES=1
         /usr/bin/env bash -c ${pw_full_command_line[*]} &
         exit 0
     fi
@@ -675,6 +677,7 @@ else
 
         print_info "Restarting PP after choose desktop file..."
         # stop_portwine
+        export SKIP_CHECK_UPDATES=1
         /usr/bin/env bash -c "${PW_EXEC_FROM_DESKTOP}" &
         exit 0
     }
@@ -684,6 +687,7 @@ else
         if gui_question "${port_clear_pfx}" ; then
             pw_clear_pfx
             print_info "Restarting PP after clearing prefix..."
+            export SKIP_CHECK_UPDATES=1
             /usr/bin/env bash -c ${pw_full_command_line[*]} &
             exit 0
         fi
@@ -705,6 +709,7 @@ else
     gui_pw_update () {
         try_remove_file "${PORT_WINE_TMP_PATH}/scripts_update_notifier"
         print_info "Restarting PP for check update..."
+        export SKIP_CHECK_UPDATES=1
         /usr/bin/env bash -c ${pw_full_command_line[*]} &
         exit 0
     }
@@ -712,6 +717,7 @@ else
     change_loc () {
         try_remove_file "${PORT_WINE_TMP_PATH}/${portname}_loc"
         print_info "Restarting PP for change language..."
+        export SKIP_CHECK_UPDATES=1
         /usr/bin/env bash -c ${pw_full_command_line[*]} &
         exit 0
     }
@@ -736,6 +742,7 @@ else
         unpack_tar_gz "$PW_SCRIPT_FROM_BACKUP" "${PORT_WINE_PATH}/data/"
         echo "0" > "${PORT_WINE_TMP_PATH}/scripts_update_notifier"
         print_info "Restarting PP after backup..."
+        export SKIP_CHECK_UPDATES=1
         /usr/bin/env bash -c ${pw_full_command_line[*]} &
         exit 0
     }

data_from_portwine/scripts/yad_gui

@@ -48,6 +48,7 @@ gui_question () {
 }
 
 pw_start_progress_bar_cover () {
+    if ! check_start_from_steam ; then
         PW_GIF_FILE="$1"
         PW_GIF_SIZE_X=`file "${PW_GIF_FILE}" | awk '{print $7 + 20}'`
         PW_GIF_SIZE_Y=`file "${PW_GIF_FILE}" | awk '{print $9 + 20}'`
@@ -55,9 +56,11 @@ pw_start_progress_bar_cover () {
         --skip-taskbar --width=$PW_GIF_SIZE_X --height=$PW_GIF_SIZE_Y --window-icon="$PW_GUI_ICON_PATH/portproton.svg" > /dev/null 2>&1 &
         export PW_YAD_PID_PROGRESS_BAR_COVER="$!"
         return 0
+    fi
 }
 
 pw_start_progress_bar_cover_block () {
+    if ! check_start_from_steam ; then
         [[ ! -f "${pw_yad}" ]] && local pw_yad="yad"
         PW_GIF_FILE="$1"
         PW_GIF_SIZE_X=`file "${PW_GIF_FILE}" | awk '{print $7 + 20}'`
@@ -66,11 +69,13 @@ pw_start_progress_bar_cover_block () {
         --skip-taskbar --width=$PW_GIF_SIZE_X --height=$PW_GIF_SIZE_Y --window-icon="$PW_GUI_ICON_PATH/portproton.svg" > /dev/null 2>&1 &
         export PW_YAD_PID_PROGRESS_BAR_COVER_BLOCK="$!"
         return 0
+    fi
 }
 
 pw_update_pfx_cover_gui () {
+    if ! check_start_from_steam ; then
         PW_KEY_PROGRESS_BAR=$RANDOM
-    PW_GIF_FILE="${PW_GUI_ICON_PATH}/covers/pw_update_pfx_cover.gif"
+        PW_GIF_FILE="${PW_GUI_ICON_PATH}/covers/update_prefix_${update_loc}.gif" 
         PW_GIF_SIZE_X=`file "${PW_GIF_FILE}" | awk '{print $7 + 40}'`
         PW_GIF_SIZE_Y=`file "${PW_GIF_FILE}" | awk '{print $9 + 80}'`
         echo "UPDATE PREFIX..." > "${PORT_WINE_TMP_PATH}/update_pfx_log"
@@ -94,20 +99,25 @@ pw_update_pfx_cover_gui () {
         --center --auto-close --skip-taskbar --width=$PW_GIF_SIZE_X --height=$PW_GIF_SIZE_Y --tab-pos=bottom 2>/dev/null &
         export PW_YAD_PID_PFX_COVER_UI="$!"
         return 0
+    fi
 }
 
 pw_start_progress_bar_cs () {
+    if ! check_start_from_steam ; then
         "${pw_yad}" --progress --progress-text="$@" --pulsate --close-on-unfocus \
         --no-buttons --undecorated --center --skip-taskbar --width=500 --wrap-width=500 > /dev/null 2>&1 &
         export PW_YAD_PID_PROGRESS_BAR_CS="$!"
         return 0
+    fi
 }
 
 pw_start_progress_bar_block () {
+    if ! check_start_from_steam ; then
         "${pw_yad}" --progress --progress-text="$@" --pulsate \
         --no-buttons --undecorated --center --skip-taskbar --width=500 --wrap-width=500 > /dev/null 2>&1 &
         export PW_YAD_PID_PROGRESS_BAR_BLOCK="$!"
         return 0
+    fi
 }
 
 pw_stop_progress_bar () {
@@ -254,6 +264,7 @@ pw_gui_for_edit_db () {
     --button="${loc_gui_open_db}"!!"${loc_gui_open_db_help}":150 \
     --button="${loc_gui_save_changes}"!!"${loc_gui_save_changes_help}":0 2>/dev/null
     YAD_STATUS="$?"
+    export SKIP_CHECK_UPDATES=1
     case "$YAD_STATUS" in
           1) /usr/bin/env bash -c ${pw_full_command_line[*]} & exit 0 ;;
           2) try_remove_file "$portwine_exe".ppdb             
@@ -346,6 +357,7 @@ gui_proton_downloader () {
     pw_stop_progress_bar
     if [[ -z "${PROTON_GE_GIT}" ]] || [[ -z "${PROTON_PW_GIT}" ]] ; then
         yad_error "$loc_gui_check_new_wine_error"
+        export SKIP_CHECK_UPDATES=1
         /usr/bin/env bash -c ${pw_full_command_line[*]} &
         exit 0
     fi
@@ -381,6 +393,7 @@ gui_proton_downloader () {
         --tab-pos=top --tab="PROTON-LG" --tab="WINE-KRON4EK"  --tab="PROTON-GE" --tab="WINE-GE-CUSTOM" --tab="$loc_gui_installed_wine" 2>/dev/null`
         YAD_WINE_STATUS="$?"
         if [[ "$YAD_WINE_STATUS" == "1" || "$YAD_WINE_STATUS" == "252" ]] ; then
+            export SKIP_CHECK_UPDATES=1
             /usr/bin/env bash -c ${pw_full_command_line[*]} &
             exit 0
         fi
@@ -397,6 +410,7 @@ gui_proton_downloader () {
             export VERSION_INSTALLED_WINE="`cat "${PORT_WINE_TMP_PATH}/tmp_installed_wine_set"`"
         else
             print_info "Nothing to do."
+            export SKIP_CHECK_UPDATES=1
             /usr/bin/env bash -c ${pw_full_command_line[*]} &
             exit 0
         fi
@@ -421,6 +435,7 @@ gui_proton_downloader () {
 	if [[ ! -z "${VERSION_INSTALLED_WINE}" ]]; then
 		try_remove_dir "${PORT_WINE_PATH}/data/dist/${VERSION_INSTALLED_WINE}"
 		unset VERSION_INSTALLED_WINE
+        export SKIP_CHECK_UPDATES=1
         /usr/bin/env bash -c ${pw_full_command_line[*]} &
         exit 0
 	fi
@@ -448,6 +463,7 @@ gui_proton_downloader () {
     fi
 
     if [[ "$1" != "silent" ]] ; then
+        export SKIP_CHECK_UPDATES=1
         /usr/bin/env bash -c ${pw_full_command_line[*]} &
         exit 0
     else
@@ -501,6 +517,7 @@ gui_vkBasalt () {
     YAD_VKBASALT_STATUS="$?"
     case "${YAD_VKBASALT_STATUS}" in
         1|252)
+            export SKIP_CHECK_UPDATES=1
             /usr/bin/env bash -c ${pw_full_command_line[*]} &
             exit 0 ;;
         180)
@@ -530,6 +547,7 @@ gui_vkBasalt () {
     else export PW_VKBASALT_FFX_CAS="0.$YAD_CAS_SET"
     fi
     edit_db_from_gui PW_VKBASALT_EFFECTS PW_VKBASALT_FFX_CAS ENABLE_VKBASALT
+    export SKIP_CHECK_UPDATES=1
     /usr/bin/env bash -c ${pw_full_command_line[*]} &
     exit 0
 }
@@ -594,6 +612,7 @@ gui_MangoHud () {
 
     case "${YAD_MANGOHUD_STATUS}" in
         1 | 252)
+            export SKIP_CHECK_UPDATES=1
             /usr/bin/env bash -c "${pw_full_command_line[*]}" &
             exit 0
             ;;
@@ -601,6 +620,7 @@ gui_MangoHud () {
             export PW_MANGOHUD=0
             export FPS_LIMIT="disabled"
             edit_db_from_gui PW_MANGOHUD FPS_LIMIT
+            export SKIP_CHECK_UPDATES=1
             /usr/bin/env bash -c "${pw_full_command_line[*]}" &
             exit 0
             ;;
@@ -644,6 +664,7 @@ gui_MangoHud () {
     export MANGOHUD_CONFIG="${GUI_MH_RESULT}"
 
     edit_db_from_gui MANGOHUD_CONFIG PW_MANGOHUD FPS_LIMIT
+    export SKIP_CHECK_UPDATES=1
     /usr/bin/env bash -c "${pw_full_command_line[*]}" &
     exit 0
 }