Commit cb7dffc7 authored by Mikhail Tergoev's avatar Mikhail Tergoev

###Scripts version 2075###

parent 307b554b
...@@ -2,6 +2,9 @@ You can help us in the development of the project on the website: https://boosty ...@@ -2,6 +2,9 @@ You can help us in the development of the project on the website: https://boosty
----------------------------------------- -----------------------------------------
Changelog: Changelog:
###Scripts version 2075###
* HOTFIX - fixed OpenGL mode
###Scripts version 2072-2074### ###Scripts version 2072-2074###
* HOTFIX - fixed launch of League of Legends * HOTFIX - fixed launch of League of Legends
......
...@@ -2,8 +2,11 @@ ...@@ -2,8 +2,11 @@
----------------------------------------- -----------------------------------------
История изменений: История изменений:
###Scripts version 2075###
* HOTFIX - исправлен режим запуска OpenGL
###Scripts version 2072-2074### ###Scripts version 2072-2074###
* HOTFIX - исправлен запуск League Of Legends * HOTFIX - исправлен запуск League of Legends
###Scripts version 2071### ###Scripts version 2071###
* добавлена возможность скачивать другие версии WINE при запуске exe файла (в выпадающем списке выбора WINE) * добавлена возможность скачивать другие версии WINE при запуске exe файла (в выпадающем списке выбора WINE)
......
...@@ -278,9 +278,9 @@ if [ ! -z "${PORTWINE_DB_FILE}" ] ; then ...@@ -278,9 +278,9 @@ if [ ! -z "${PORTWINE_DB_FILE}" ] ; then
[ -z "${PW_VULKAN_USE}" ] && export PW_VULKAN_USE=1 [ -z "${PW_VULKAN_USE}" ] && export PW_VULKAN_USE=1
fi fi
case "${PW_VULKAN_USE}" in case "${PW_VULKAN_USE}" in
"0") export PW_DEFAULT_VULKAN_USE='OPENGL !VULKAN (DXVK and VKD3D)!VULKAN (WINE DXGI)' ;; "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 ' ;; "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 ' ;; "2") export PW_DEFAULT_VULKAN_USE='VULKAN (WINE DXGI)!VULKAN (DXVK and VKD3D)!OPENGL' ;;
esac esac
if [[ ! -z `echo "${PW_WINE_USE}" | grep "^PROTON_STEAM$"` ]] ; then 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" 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 ...@@ -297,7 +297,7 @@ if [ ! -z "${PORTWINE_DB_FILE}" ] ; then
fi fi
fi fi
else 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 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" 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 elif [[ ! -z `echo "${PW_WINE_USE}" | grep "^PROTON_GE$"` ]] ; then
...@@ -330,7 +330,7 @@ if [ ! -z "${portwine_exe}" ]; then ...@@ -330,7 +330,7 @@ if [ ! -z "${portwine_exe}" ]; then
export PW_YAD_SET="$?" export PW_YAD_SET="$?"
if [[ "$PW_YAD_SET" == "1" || "$PW_YAD_SET" == "252" ]] ; then exit 0 ; fi 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 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 elif [ ! -z "${PORTWINE_DB_FILE}" ]; then
portwine_launch portwine_launch
fi fi
...@@ -451,9 +451,9 @@ else ...@@ -451,9 +451,9 @@ else
fi fi
if [ -f "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" ] ; then if [ -f "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" ] ; then
cat "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" 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}'` 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
fi fi
......
#!/bin/bash #!/bin/bash
#Author: Castro-Fidel (PortWINE-Linux.ru) #Author: Castro-Fidel (PortWINE-Linux.ru)
#SCRIPTS_NEXT_VERSION=2074 #SCRIPTS_NEXT_VERSION=2075
#PORT_NEXT_VERSION=97 #PORT_NEXT_VERSION=97
######################################################################## ########################################################################
export PW_MANGOHUD=1 export PW_MANGOHUD=1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment