From 65ead2cae9ea7094083bd4bff15c1d4fd892e636 Mon Sep 17 00:00:00 2001
From: castro-fidel <tergoevm@gmail.com>
Date: Wed, 17 Nov 2021 00:37:29 +0300
Subject: [PATCH] ###Scripts version 2050###

---
 data_from_portwine/changelog                | 3 +++
 data_from_portwine/scripts/functions_helper | 3 ++-
 data_from_portwine/scripts/runlib           | 6 +-----
 data_from_portwine/scripts/start.sh         | 2 +-
 data_from_portwine/scripts/var              | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog
index c929386..c4f427f 100755
--- a/data_from_portwine/changelog
+++ b/data_from_portwine/changelog
@@ -5,6 +5,9 @@
 * добавить проверку количества db файлов на один exe
 * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru
 -----------------------------------------
+###Scripts version 2050###
+* HOTFIX - отображение версий WINE при создании db файла
+
 ###Scripts version 2049###
 * добавлено скачивание из github нового архива plugins_v1 в котором содержится d3d_extras, beclient, nvml и nvapi (ускоряет первичный запуск PortProton)
 * каталоги с новыми версиями PROTON STEAM и GE не удаляют старые версии
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index adf782f..2429a65 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -771,7 +771,8 @@ gui_proton_downloader () {
     for PPWGIT in ${PROTON_PW_GIT[@]} ; do
         echo ${PPWGIT} | awk -F/ '{print $NF}' | sed 's/.tar.xz//' >> "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git"
     done
-    sed -i /${PW_PROTON_GE_VER}/d "${PORT_WINE_TMP_PATH}/tmp_proton_ge_git"
+    sed -i /${PW_PROTON_GE_VER}/d "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git"
+    sed -i '/plugins/d' "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git"
 
     for INSTALLING_VERSION_IN_DIST in `ls "${PORT_WINE_PATH}/data/dist/"` ; do
         sed -i "/${INSTALLING_VERSION_IN_DIST}$/Id" "${PORT_WINE_TMP_PATH}/tmp_proton_ge_git"
diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib
index d4c926b..6e9824c 100755
--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@@ -110,10 +110,6 @@ start_portwine () {
         [[ ! -d "${PW_WINELIB}/portable/lib/lib/i386-linux-gnu" ]] && ln -s "${PW_WINELIB}/portable/lib/lib32" "${PW_WINELIB}/portable/lib/lib/i386-linux-gnu"
         [[ ! -d "${PW_WINELIB}/portable/lib/lib/x86_64-linux-gnu" ]] && ln -s "${PW_WINELIB}/portable/lib/lib" "${PW_WINELIB}/portable/lib/lib/x86_64-linux-gnu"  
         echo "RUNTIME is enabled"
-        #HOTFIX portable libs for Red Hat
-        [[ ! -d "${PW_WINELIB}/portable/lib/lib/lib" ]] && ln -s "${PW_WINELIB}/portable/lib/lib32" "${PW_WINELIB}/portable/lib/lib/lib"
-        [[ ! -d "${PW_WINELIB}/portable/lib/lib/lib64" ]] && ln -s "${PW_WINELIB}/portable/lib/lib" "${PW_WINELIB}/portable/lib/lib/lib64"  
-        echo "RUNTIME is enabled"
     fi
 
     if [[ ! -z "${PW_LOG}" && "${PW_LOG}" != 0 ]] ; then
@@ -248,7 +244,7 @@ start_portwine () {
             setxkbmap us,ru
         fi
     fi
-    if [[ -x "`which "gamemoderun" 2>/dev/null`" && "$PW_USE_GAMEMODE" = "1" ]] ; then
+    if [[ -x "`which "gamemoderun" 2>/dev/null`" && "$PW_USE_GAMEMODE" = "1" && -z "`cat /etc/os-release | grep -i "red hat"`" ]] ; then
         export PW_GAMEMODERUN=1
         echo "Gamemod will be launched."
     else
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index 3383c48..a511ca9 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -269,7 +269,7 @@ if [ ! -z "${PORTWINE_DB_FILE}" ] ; then
     esac
 else
     export PW_DEFAULT_VULKAN_USE='VULKAN (DXVK and VKD3D)!OPENGL '
-    export PW_DEFAULT_WINE_USE="${PW_PROTON_STEAM_VER}${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}"
+    export PW_DEFAULT_WINE_USE="${PW_PROTON_STEAM_VER}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}"
     unset PW_GUI_DISABLED_CS
 fi
 if [ ! -z "${portwine_exe}" ]; then
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index 849f3a0..d169787 100755
--- a/data_from_portwine/scripts/var
+++ b/data_from_portwine/scripts/var
@@ -1,6 +1,6 @@
 #!/bin/bash
 #Author: Castro-Fidel (PortWINE-Linux.ru)
-#SCRIPTS_NEXT_VERSION=2049
+#SCRIPTS_NEXT_VERSION=2050
 #PORT_NEXT_VERSION=97
 ########################################################################
 export PW_MANGOHUD=1