diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog index 9c00e0f6..5da46dbf 100644 --- a/data_from_portwine/changelog +++ b/data_from_portwine/changelog @@ -10,6 +10,9 @@ * добавить комментарии описывающие функционал скриптов * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru ----------------------------------------- +###Scripts version 2009### +* FIX - исправлен перезапуск редактора db файлов при первом включении PW_GUI_DISABLED_CS (отключение запуска GUI) + ###Scripts version 2008### * HOTFIX - исправление функции pw_kill_autostart diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 3eee7bef..92fc5bbd 100644 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -606,10 +606,9 @@ pw_gui_for_edit_db () { unset ADD_CHK_BOX_EDIT_DB edit_db_field_add () { for int_to_boole in $@ ; do - if [ "${!int_to_boole}" == "1" ] ; then - export ${int_to_boole}="TRUE" - else - export ${int_to_boole}="FALSE" + if [ "${!int_to_boole}" == "1" ] + then export ${int_to_boole}="TRUE" + else export ${int_to_boole}="FALSE" fi ADD_CHK_BOX_EDIT_DB="${ADD_CHK_BOX_EDIT_DB} --field="${int_to_boole}:CHK" "${!int_to_boole}"" done @@ -628,10 +627,9 @@ pw_gui_for_edit_db () { edit_db_field_read () { for boole_to_int in $@ ; do export ${boole_to_int}=${output_yad_edit_db[$bool_from_yad]} - if [ "${!boole_to_int}" == "TRUE" ] ; then - export ${boole_to_int}="1" - else - export ${boole_to_int}="0" + if [ "${!boole_to_int}" == "TRUE" ] + then export ${boole_to_int}="1" + else export ${boole_to_int}="0" fi export bool_from_yad=$(( ${bool_from_yad} + 1 )) done diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index c287ba86..94947d86 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -426,7 +426,7 @@ pw_run () { ###MAIN### unset MANGOHUD MANGOHUD_DLSYM PW_NO_ESYNC PW_NO_FSYNC PW_VULKAN_USE WINEDLLOVERRIDES PW_NO_WRITE_WATCH PW_GUI_DISABLED_CS -unset PW_CHECK_AUTOINSTAL PW_VKBASALT_EFFECTS PW_VKBASALT_FFX_CAS PORTWINE_DB PORTWINE_DB_FILE PW_DISABLED_CREAT_DB +unset PW_CHECK_AUTOINSTAL PW_VKBASALT_EFFECTS PW_VKBASALT_FFX_CAS PORTWINE_DB PORTWINE_DB_FILE PW_DISABLED_CREAT_DB PW_YAD_SET cd "$(dirname "`readlink -f "$0"`")" && export PORT_SCRIPTS_PATH="$(pwd)" cd "${PORT_SCRIPTS_PATH}/../../" && export PORT_WINE_PATH="$(pwd)" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index b4ae0ebb..12039776 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -204,8 +204,10 @@ pw_edit_db () { pw_gui_for_edit_db ENABLE_VKBASALT PW_NO_ESYNC PW_NO_FSYNC PW_DXR_ON PW_VULKAN_NO_ASYNC PW_USE_NVAPI \ PW_OLD_GL_STRING PW_HIDE_NVIDIA_GPU PW_FORCE_USE_VSYNC PW_VIRTUAL_DESKTOP PW_WINEDBG_DISABLE PW_USE_TERMINAL \ PW_WINE_ALLOW_XIM PW_HEAP_DELAY_FREE PW_NO_WRITE_WATCH PW_GUI_DISABLED_CS - [ "$?" == 0 ] && /bin/bash -c ${pw_full_command_line[*]} & - exit 0 + if [ "$?" == 0 ] ; then + /bin/bash -c ${pw_full_command_line[*]} & + exit 0 + fi } pw_autoinstall_from_db () { @@ -223,18 +225,13 @@ if [ ! -z "${PORTWINE_DB_FILE}" ] ; then [ -z "${PW_WINE_USE}" ] && export PW_WINE_USE=proton_steam fi case "${PW_VULKAN_USE}" in - "vkd3d") - export PW_DEFAULT_VULKAN_USE='VKD3D (DX 12 to Vulkan)\!DXVK (DX 9-11 to Vulkan)\!OPENGL ' ;; - "0") - export PW_DEFAULT_VULKAN_USE='OPENGL \!DXVK (DX 9-11 to Vulkan)\!VKD3D (DX 12 to Vulkan)' ;; - *) - export PW_DEFAULT_VULKAN_USE='DXVK (DX 9-11 to Vulkan)\!VKD3D (DX 12 to Vulkan)\!OPENGL ' ;; + "vkd3d") export PW_DEFAULT_VULKAN_USE='VKD3D (DX 12 to Vulkan)\!DXVK (DX 9-11 to Vulkan)\!OPENGL ' ;; + "0") export PW_DEFAULT_VULKAN_USE='OPENGL \!DXVK (DX 9-11 to Vulkan)\!VKD3D (DX 12 to Vulkan)' ;; + *) export PW_DEFAULT_VULKAN_USE='DXVK (DX 9-11 to Vulkan)\!VKD3D (DX 12 to Vulkan)\!OPENGL ' ;; esac case "${PW_WINE_USE}" in - "proton_ge") - export PW_DEFAULT_WINE_USE='PROTON_GE (FSR included)\!PROTON_STEAM' ;; - *) - export PW_DEFAULT_WINE_USE='PROTON_STEAM\!PROTON_GE (FSR included)' ;; + "proton_ge") export PW_DEFAULT_WINE_USE='PROTON_GE (FSR included)\!PROTON_STEAM' ;; + *) export PW_DEFAULT_WINE_USE='PROTON_STEAM\!PROTON_GE (FSR included)' ;; esac else export PW_DEFAULT_VULKAN_USE='DXVK (DX 9-11 to Vulkan)\!VKD3D (DX 12 to Vulkan)\!OPENGL ' diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index ec2c2b20..e282c53b 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=2008 +#SCRIPTS_NEXT_VERSION=2009 ######################################################################## export PW_MANGOHUD=1 export MANGOHUD_CONFIG=font_size=24,position=top-left,toggle_hud=Shift_R+F12,no_display,resolution,wine,gpu_name,vulkan_driver,gpu_stats,vkbasalt @@ -20,7 +20,7 @@ export PW_FORCE_USE_VSYNC=2 export PW_LOG=0 export PW_TERM="" export PW_USE_TERMINAL=0 -export PW_MUST_HAVE_DLL="mfc42 vcrun2019 d3dcompiler_42 d3dcompiler_43 d3dcompiler_47 d3dx9" +export PW_MUST_HAVE_DLL="d3dx9_43 physx mfc42 vcrun2019 d3dcompiler_42 d3dcompiler_43 d3dcompiler_47 d3dx9" export PW_WINEDBG_DISABLE=1 export PW_WINDOWS_VER="10" export WINEARCH="win64"