expanding integration with PPQT (alpha)

data_from_portwine/scripts/functions_helper

@@ -2,21 +2,29 @@
 # Author: Castro-Fidel (linux-gaming.ru)
 # shellcheck disable=SC2034
 ########################################################################
-
 $PW_DEBUG
-print_error () { printf "\E[31m%s Error: $@ %s\e[0m\n" ;}
+
+process_log () {
+    if [[ $PROCESS_LOG == "1" ]] ; then
+        local filter_word="mono|gecko"
+        echo "$@" | sed -r "/$filter_word/Id" >> "$PW_TMPFS_PATH/process.log"
+    fi
+}
+export -f process_log
+
+print_error () { printf "\E[31m%s Error: $@ %s\e[0m\n" ; process_log "$@" ;}
 export -f print_error
 
-print_warning () { printf "\E[33m%s Warning: $@ %s\e[0m\n" ;}
+print_warning () { printf "\E[33m%s Warning: $@ %s\e[0m\n" ; process_log "$@" ;}
 export -f print_warning
 
-print_info () { printf "\E[36m%s Info: $@ %s\e[0m\n" ;}
+print_info () { printf "\E[36m%s Info: $@ %s\e[0m\n" ; process_log "$@" ;}
 export -f print_info
 
-print_ok () { printf "\E[35m%s OK: $@ %s\e[0m\n" ;}
+print_ok () { printf "\E[35m%s OK: $@ %s\e[0m\n" ; process_log "$@" ;}
 export -f print_ok
 
-print_var () { for vp in $@ ; do print_info "${vp}=${!vp}" ; done ;}
+print_var () { for vp in $@ ; do echo "${vp}=${!vp}" ; done ;}
 export -f print_var
 
 print_wrapped () {
@@ -620,6 +628,10 @@ try_download () {
     if [[ "$silent" == "true" ]] ; then
         curl -f -# -A 'Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)' -H 'Cache-Control: no-cache, no-store' \
         -H 'Pragma: no-cache' -L "${FIRST_URL[@]}" -o "$dest" 2>&1
+    elif [[ $PROCESS_LOG == "1" ]] ; then
+        curl -f -# -A 'Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)' -H 'Cache-Control: no-cache, no-store' \
+        -H 'Pragma: no-cache' -L "${FIRST_URL[@]}" -o "$dest" 2>&1 \
+        | tr '\r' '\n' | sed -ur 's|[# ]+||g;s|100||g;s|0-||g;s|.*=.*||g' >> "$PW_TMPFS_PATH/process.log"
     else
         curl -f -# -A 'Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)' -H 'Cache-Control: no-cache, no-store' \
         -H 'Pragma: no-cache' -L "${FIRST_URL[@]}" -o "$dest" 2>&1 | \
@@ -861,7 +873,7 @@ background_pid () {
     arg2=$2 # Название команды
     arg3=$3 # Номер процесса (1,2,3..)
 
-    if [[ "$START_FROM_STEAM" == 1 ]] \
+    if check_start_from_steam \
     || [[ "$PW_GUI_DISABLED_CS" == 1 ]] \
     || [[ -n "$PW_DEBUG" ]] ; then
         case $arg1 in
@@ -4437,9 +4449,15 @@ pw_run () {
 
     PW_LOG_TO_FILE="${PORT_WINE_PATH}/PortProton.log"
     PW_LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}:${WINE_LIBRARY_PATH}"
-    print_var "WINEDIR" "WINEPREFIX" "WINEDLLOVERRIDES" "PATH_TO_GAME" "PW_WINE_USE" "PW_VULKAN_USE" "VULKAN_DRIVER_NAME"
+
-    print_var "WINELOADER" "VKD3D_CONFIG" "PW_LD_LIBRARY_PATH" "PATH" "WINEESYNC" "WINEFSYNC" "WINEFSYNC_FUTEX2"
+    echo "##### Current variables #####" > "$PW_TMPFS_PATH/var.log"
-    print_var "WINEDLLPATH" "WINE_CPU_TOPOLOGY" "PW_RUN_GAMESCOPE" "LD_LIBRARY_PATH" "PW_VK_ICD_FILENAMES" "PW_TASKSET_SLR"
+    for var in "WINEDIR" "WINEPREFIX" "WINEDLLOVERRIDES" "PATH_TO_GAME" "PW_WINE_USE" "PW_VULKAN_USE" "VULKAN_DRIVER_NAME" \
+               "WINELOADER" "VKD3D_CONFIG" "PW_LD_LIBRARY_PATH" "PATH" "WINEESYNC" "WINEFSYNC" "WINEFSYNC_FUTEX2" \
+               "WINEDLLPATH" "WINE_CPU_TOPOLOGY" "PW_RUN_GAMESCOPE" "LD_LIBRARY_PATH" "PW_VK_ICD_FILENAMES" "PW_TASKSET_SLR"
+    do
+        print_var "$var" | tee -a "$PW_TMPFS_PATH/var.log"
+    done
+
     proxy_launch_parameters=${LAUNCH_PARAMETERS//\\\\/\\}
     if [[ "$PW_USE_RUNTIME" == 1 ]] \
     && [[ "$PW_WINE_USE" != "USE_SYSTEM_WINE" ]]

data_from_portwine/scripts/start.sh

@@ -315,18 +315,19 @@ fi
 if ! check_flatpak ; then
     if [[ -f "${PW_TMPFS_PATH}/portproton.lock" ]] ; then
         print_warning "Found lock file: ${PW_TMPFS_PATH}/portproton.lock"
-        if [[ $START_FROM_STEAM != "1" ]]
+        if ! check_start_from_steam
         then yad_question "${translations[A running PortProton session was detected.\\nDo you want to end the previous session?]}" || exit 0
         fi
     fi
     touch "${PW_TMPFS_PATH}/portproton.lock"
-    rm_lock_file () {
-        echo "Removing the lock file..."
-        rm -fv "${PW_TMPFS_PATH}/portproton.lock" && echo "OK"
-    }
-    trap "rm_lock_file" EXIT
 fi
 
+rm_log_lock () {
+    rm -fv "${PW_TMPFS_PATH}"/*.log
+    rm -fv "${PW_TMPFS_PATH}/portproton.lock"
+}
+trap "rm_log_lock" EXIT
+
 if check_flatpak ; then
     try_remove_dir "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}"
 else pw_download_libs
@@ -413,13 +414,13 @@ EOF
             while read -r line
             do
                 export portwine_exe="$PORT_WINE_PATH/data/prefixes/$PW_PREFIX_NAME/$line"
-                if [[ $START_FROM_STEAM == "1" ]]
+                if check_start_from_steam
                 then portwine_output_yad_shortcut --silent
                 else portwine_create_shortcut
                 fi
             done < "$PORT_WINE_PATH/data/prefixes/$PW_PREFIX_NAME/.create_shortcut"
         fi
-        if [[ $START_FROM_STEAM != "1" ]]
+        if ! check_start_from_steam
         then yad_info "${translations[Unpack is DONE for prefix:]} <b>\"${PW_PREFIX_NAME}\"</b>."
         fi
         exit 0

data_from_portwine/scripts/var

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #Author: Castro-Fidel (linux-gaming.ru)
-#SCRIPTS_NEXT_VERSION=2425
+#SCRIPTS_NEXT_VERSION=2426
 #SCRIPTS_STABLE_VERSION=2425
 ########################################################################
 export AI_TOP_GAMES="PW_LGC PW_VKPLAY PW_EPIC PW_BATTLE_NET PW_WORLD_OF_SEA_BATTLE PW_RUSSIAN_FISHING PW_HO_YO_PLAY PW_FARLIGHT84 PW_WARFRAME PW_WGC PW_UBISOFT"