From 733149752e85979d717b35a0f02e6bd4610c5c1e Mon Sep 17 00:00:00 2001
From: Boria138 <boriabloger@protonmail.com>
Date: Tue, 7 Nov 2023 23:00:15 +0600
Subject: [PATCH] Made the log more detailed

---
 data_from_portwine/scripts/start.sh | 40 +++++++++++++++++++----------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index 0c7f0ae..63a2b47 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -113,22 +113,27 @@ portwine_start_debug () {
     echo "--------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
     if [[ "${PW_VULKAN_USE}" = "0" ]] ; then 
         echo "PW_VULKAN_USE=${PW_VULKAN_USE} - DX9-11 to ${loc_gui_open_gl}" >> "${PORT_WINE_PATH}/${portname}.log"
+    elif [[ "${PW_VULKAN_USE}" = "1" ]] ; then
+        echo "PW_VULKAN_USE=${PW_VULKAN_USE} - DXVK v.${DXVK_STABLE_VER} and VKD3D-PROTON v.${VKD3D_STABLE_VER}" >> "${PORT_WINE_PATH}/${portname}.log"
+    elif [[ "${PW_VULKAN_USE}" = "2" ]] ; then
+        echo "PW_VULKAN_USE=${PW_VULKAN_USE} - DXVK v.${DXVK_GIT_VER} and VKD3D-PROTON v.${VKD3D_GIT_VER}" >> "${PORT_WINE_PATH}/${portname}.log"
     elif [[ "${PW_VULKAN_USE}" = "3" ]] ; then 
         echo "PW_VULKAN_USE=${PW_VULKAN_USE} - native DX9 on MESA drivers" >> "${PORT_WINE_PATH}/${portname}.log"
+    elif [[ "${PW_VULKAN_USE}" = "4" ]] ; then
+        echo "PW_VULKAN_USE=${PW_VULKAN_USE} - DirectX to wined3d vulkan" >> "${PORT_WINE_PATH}/${portname}.log"
     else 
         echo "PW_VULKAN_USE=${PW_VULKAN_USE}" >> "${PORT_WINE_PATH}/${portname}.log"
     fi
     echo "--------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
-    echo "Version WINE in the Port:" >> "${PORT_WINE_PATH}/${portname}.log"
+    echo "Version WINE in use:" >> "${PORT_WINE_PATH}/${portname}.log"
     echo "$PW_WINE_USE" >> "${PORT_WINE_PATH}/${portname}.log"
-    echo "------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
-    echo "Program bit depth" >> "${PORT_WINE_PATH}/${portname}.log"
+    echo "-------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
+    echo "Program bit depth:" >> "${PORT_WINE_PATH}/${portname}.log"
     if [[ $(file "$portwine_exe") =~ x86-64 ]]; then
         echo "64 bit" >> "${PORT_WINE_PATH}/${portname}.log"
     echo "-----------------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
     else
         echo "32 bit" >> "${PORT_WINE_PATH}/${portname}.log"
-    echo "------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
     fi
     echo "--------------------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
     echo "Date and time of start debug for ${portname}:" >> "${PORT_WINE_PATH}/${portname}.log"
@@ -137,7 +142,7 @@ portwine_start_debug () {
     echo "The installation path of the ${portname}:" >> "${PORT_WINE_PATH}/${portname}.log"
     echo "$PORT_WINE_PATH" >> "${PORT_WINE_PATH}/${portname}.log"
     echo "----------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
-    echo "Operating system" >> "${PORT_WINE_PATH}/${portname}.log"
+    echo "Operating system:" >> "${PORT_WINE_PATH}/${portname}.log"
     cat /etc/os-release | grep -oP 'PRETTY_NAME="\K[^"]+' >> "${PORT_WINE_PATH}/${portname}.log"
     echo "--------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
     echo "Desktop environment:" >> "${PORT_WINE_PATH}/${portname}.log"
@@ -145,13 +150,14 @@ portwine_start_debug () {
     echo "Current desktop: ${XDG_CURRENT_DESKTOP}" >> "${PORT_WINE_PATH}/${portname}.log"
     echo "Session type: ${XDG_SESSION_TYPE}" >> "${PORT_WINE_PATH}/${portname}.log"
     echo "--------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
-    echo "Kernel" >> "${PORT_WINE_PATH}/${portname}.log"
+    echo "Kernel:" >> "${PORT_WINE_PATH}/${portname}.log"
     uname -r >> "${PORT_WINE_PATH}/${portname}.log"
     echo "-------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
-    echo "CPU" >> "${PORT_WINE_PATH}/${portname}.log"
-    cat /proc/cpuinfo | grep "model name" >> "${PORT_WINE_PATH}/${portname}.log"
+    echo "CPU:" >> "${PORT_WINE_PATH}/${portname}.log"
+    echo "$(cat /proc/cpuinfo | grep 'cpu cores' | sort -u | cut -d':' -f2)-physical $(cat /proc/cpuinfo | \
+    grep 'processor' | wc -l)-logical cores $(cat /proc/cpuinfo | grep 'model name' | sort -u | cut -d':' -f2)" >> "${PORT_WINE_PATH}/${portname}.log"
     echo "------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
-    echo "RAM" >> "${PORT_WINE_PATH}/${portname}.log"
+    echo "RAM:" >> "${PORT_WINE_PATH}/${portname}.log"
     free -m >> "${PORT_WINE_PATH}/${portname}.log"
     echo "-----------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
     echo "Graphic cards and drivers:" >> "${PORT_WINE_PATH}/${portname}.log"
@@ -169,15 +175,21 @@ portwine_start_debug () {
     if [ $? -eq 0 ]; then
         echo "Vulkan cube test passed successfully" >> "${PORT_WINE_PATH}/${portname}.log"
     else
-        echo "Vkcube test completed with error" >> "${PORT_WINE_PATH}/${portname}.log"
+        echo "Vulkan cube test completed with error" >> "${PORT_WINE_PATH}/${portname}.log"
     fi
-    if [ ! -x "$(command -v gamemoderun 2>/dev/null)" ]
+    echo "----------------------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
+    echo "GameMode status:" >> "${PORT_WINE_PATH}/${portname}.log"
+    if gamemoded -s | grep -q "active";
     then
-        echo "---------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
-        echo "!!!gamemod not found!!!"  >> "${PORT_WINE_PATH}/${portname}.log"
+        echo "gamemode is active"  >> "${PORT_WINE_PATH}/${portname}.log"
+    elif gamemoded -s | grep -q "inactive";
+    then
+        echo "gamemode is inactive"  >> "${PORT_WINE_PATH}/${portname}.log"
+    else
+        echo "gamemode is not found"  >> "${PORT_WINE_PATH}/${portname}.log"
     fi
     echo "---------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
-    echo 'locale :' >> "${PORT_WINE_PATH}/${portname}.log"
+    echo 'locale:' >> "${PORT_WINE_PATH}/${portname}.log"
     locale >> "${PORT_WINE_PATH}/${portname}.log"
     echo "---" >> "${PORT_WINE_PATH}/${portname}.log"
     echo 'locale -a | grep -i "$(locale | grep -e '^LANG=' | sed 's/LANG=//' | sed  's/\-8//')" :' >> "${PORT_WINE_PATH}/${portname}.log"