From cb7dffc70ac4f8e4f18c8bdfa26b781f9c5d3d2d Mon Sep 17 00:00:00 2001
From: castro-fidel <tergoevm@gmail.com>
Date: Wed, 26 Jan 2022 16:29:41 +0300
Subject: [PATCH] ###Scripts version 2075###

---
 data_from_portwine/changelog_eng    |  3 +++
 data_from_portwine/changelog_rus    |  5 ++++-
 data_from_portwine/scripts/start.sh | 14 +++++++-------
 data_from_portwine/scripts/var      |  2 +-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng
index 3a45eb3c..b4e820c3 100644
--- 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://boosty
 -----------------------------------------
 Changelog:
 
+###Scripts version 2075###
+* HOTFIX - fixed OpenGL mode
+
 ###Scripts version 2072-2074###
 * HOTFIX - fixed launch of League of Legends
 
diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus
index ab3eec5e..0dd1626a 100755
--- a/data_from_portwine/changelog_rus
+++ b/data_from_portwine/changelog_rus
@@ -2,8 +2,11 @@
 -----------------------------------------
 История изменений:
 
+###Scripts version 2075###
+* HOTFIX - исправлен режим запуска OpenGL
+
 ###Scripts version 2072-2074###
-* HOTFIX - исправлен запуск League Of Legends
+* HOTFIX - исправлен запуск League of Legends
 
 ###Scripts version 2071###
 * добавлена возможность скачивать другие версии WINE при запуске exe файла (в выпадающем списке выбора WINE)
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index 07834c78..47bb1764 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -278,9 +278,9 @@ if [ ! -z "${PORTWINE_DB_FILE}" ] ; then
         [ -z "${PW_VULKAN_USE}" ] && export PW_VULKAN_USE=1
     fi
     case "${PW_VULKAN_USE}" in
-            "0") export PW_DEFAULT_VULKAN_USE='OPENGL !VULKAN (DXVK and VKD3D)!VULKAN (WINE DXGI)' ;;
-            "1") export PW_DEFAULT_VULKAN_USE='VULKAN (DXVK and VKD3D)!VULKAN (WINE DXGI)!OPENGL ' ;;
-            "2") export PW_DEFAULT_VULKAN_USE='VULKAN (WINE DXGI)!VULKAN (DXVK and VKD3D)!OPENGL ' ;;
+            "0") export PW_DEFAULT_VULKAN_USE='OPENGL!VULKAN (DXVK and VKD3D)!VULKAN (WINE DXGI)' ;;
+            "1") export PW_DEFAULT_VULKAN_USE='VULKAN (DXVK and VKD3D)!VULKAN (WINE DXGI)!OPENGL' ;;
+            "2") export PW_DEFAULT_VULKAN_USE='VULKAN (WINE DXGI)!VULKAN (DXVK and VKD3D)!OPENGL' ;;
     esac
     if [[ ! -z `echo "${PW_WINE_USE}" | grep "^PROTON_STEAM$"` ]] ; then
         export PW_DEFAULT_WINE_USE="${PW_PROTON_STEAM_VER}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE"
@@ -297,7 +297,7 @@ if [ ! -z "${PORTWINE_DB_FILE}" ] ; then
         fi
     fi
 else
-    export PW_DEFAULT_VULKAN_USE='VULKAN (DXVK and VKD3D)!VULKAN (WINE DXGI)!OPENGL '
+    export PW_DEFAULT_VULKAN_USE='VULKAN (DXVK and VKD3D)!VULKAN (WINE DXGI)!OPENGL'
     if [[ ! -z `echo "${PW_WINE_USE}" | grep "^PROTON_STEAM$"` ]] ; then
         export PW_DEFAULT_WINE_USE="${PW_PROTON_STEAM_VER}!${PW_PROTON_GE_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE"
     elif [[ ! -z `echo "${PW_WINE_USE}" | grep "^PROTON_GE$"` ]] ; then
@@ -330,7 +330,7 @@ if [ ! -z "${portwine_exe}" ]; then
         export PW_YAD_SET="$?"
         if [[ "$PW_YAD_SET" == "1" || "$PW_YAD_SET" == "252" ]] ; then exit 0 ; fi
         export VULKAN_MOD=`echo "${OUTPUT_START}" | grep \;\; | awk -F";" '{print $1}'`
-        export PW_WINE_VER=`echo "${OUTPUT_START}" | grep \;\; | awk -F";" '{print $2}' | awk '{print $1}'`
+        export PW_WINE_VER=`echo "${OUTPUT_START}" | grep \;\; | awk -F";" '{print $2}'`
     elif [ ! -z "${PORTWINE_DB_FILE}" ]; then
         portwine_launch
     fi
@@ -451,9 +451,9 @@ else
     fi
     if [ -f "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" ] ; then
         cat "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan"
-        export VULKAN_MOD=`cat "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" | grep \;\; | awk '{print $1}' | awk -F";" '{print $1}'`
+        export VULKAN_MOD=`cat "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" | grep \;\;  | awk -F";" '{print $1}'`
         export PW_WINE_VER=`cat "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" | grep \;\; | awk -F";" '{print $5}'`
-        #try_remove_file "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan"
+        try_remove_file "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan"
     fi
 fi
 
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index 8df38b42..ddff1fe8 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=2074
+#SCRIPTS_NEXT_VERSION=2075
 #PORT_NEXT_VERSION=97
 ########################################################################
 export PW_MANGOHUD=1