From 63beb66eb3eaa6323319c372bef4dc38105ce170 Mon Sep 17 00:00:00 2001 From: castro-fidel Date: Wed, 10 Nov 2021 01:04:16 +0300 Subject: [PATCH] Scripts version 2046 --- data_from_portwine/changelog | 3 +++ data_from_portwine/scripts/functions_helper | 6 +++++- data_from_portwine/scripts/start.sh | 1 - data_from_portwine/scripts/var | 4 ++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog index 386020d..01f3c22 100755 --- a/data_from_portwine/changelog +++ b/data_from_portwine/changelog @@ -7,6 +7,9 @@ * добавить проверку количества db файлов на один exe * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru ----------------------------------------- +###Scripts version 2046### +* update DXVK and VKD3D in PROTON_GE + ###Scripts version 2045### * добавлена возможность запуска нескольких приложений с помощью WINEFILE из трея. * добавлен вывод user.conf в лог-файл diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 18b3bc7..c1e7207 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -707,7 +707,11 @@ pw_gui_for_edit_db () { --text "Change settings in database file for ${PORTWINE_DB}\n" --separator=" " --borders=10 --center \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --button="CANCEL":1 --button="OPEN DB FILE":150 --button="SAVE CHANGES":0 YAD_STATUS="$?" - if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then exit 0 + if [[ "$YAD_STATUS" == "1" ]] ; then + /bin/bash -c ${pw_full_command_line[*]} & + exit 0 + elif [[ "$YAD_STATUS" == "252" ]] ; then + exit 0 elif [ "$YAD_STATUS" == "150" ] ; then xdg-open "${PORTWINE_DB_FILE}" & exit 0 diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index fc9df18..5f963f9 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -220,7 +220,6 @@ pw_edit_db () { } pw_autoinstall_from_db () { - kill_portwine export PW_USER_TEMP="$WINEPREFIX/drive_c" export PW_FORCE_LARGE_ADDRESS_AWARE=0 export PW_USE_GAMEMODE=0 diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index dd2835f..88c6bcc 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=2045 +#SCRIPTS_NEXT_VERSION=2046 #PORT_NEXT_VERSION=97 ######################################################################## export PW_MANGOHUD=0 @@ -39,7 +39,7 @@ export PW_PROTON_STEAM_VER="PROTON_STEAM_${PW_STEAM_VER}" export PW_MONO_VER="6.3.0" export PW_GECKO_VER="2.47.2" ###WINE_PROTON_GE### -export PW_GE_VER="6.19-2" +export PW_GE_VER="6.19-3" export PW_PROTON_GE_VER="PROTON_GE_${PW_GE_VER}" export PW_MONO_GE_VER="6.4.0" export PW_GECKO_GE_VER="2.47.2"