diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 2a9a8312..f19c3f89 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,17 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2227### Date: 22.10.2023 / Download update size: 520 megabytes +* updated PROTON_LG to version 8-20 (LGC and WGC no longer require a separate version of WINE) +* updated WINE_LG to version 8-18 (improved operation of vkPlay games: fixed videos in Atomic Heart TVs, the game Kuzhlevka works) +* the libs_v44 library package has been updated: + pressure-vessel 0.20230928.1 + sniper 0.20231005.62324 + reduced the size of the archive with libraries +* accelerated prefix creation and updating +* test: added driver selection for AMD (thanks to Boria138) +* minor additional script improvements + ###Scripts version 2226### Date: 09.10.2023 / Download update size: 8 megabytes * updated autoinstall scripts (thanks Boria138) * minor improvements diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index dd796478..e8f64d3a 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,18 @@ ----------------------------------------- История изменений: +###Scripts version 2227### Дата: 22.10.2023 / Размер скачиваемого обновления: 520 мегабайт +* обновлен PROTON_LG до версии 8-20 (LGC и WGC более не требуют отдельной версии WINE) +* обновлен WINE_LG до версии 8-18 (улучшена работа игр vkPlay: исправлены видео в телевизорах Atomic Heart, работает игра Кужлёвка) +* обновлен пакет библиотек libs_v44: + pressure-vessel 0.20230928.1 + sniper 0.20231005.62324 + уменьшен размер архива с библиотеками +* ускорено создание и обновление префикса +* улучшена локализация (спасибо Boria138) +* тест: добавлен выбор драйвера для AMD (спасибо Boria138) +* небольшие дополнительные улучшения скриптов + ###Scripts version 2226### Дата: 09.10.2023 / Размер скачиваемого обновления: 8 мегабайт * обновлены автоустановки лончеров (спасибо Boria138) * небольшие исправления скриптов diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 5763bfad..1ba9aa55 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -171,42 +171,41 @@ create_new_dir () { } var_winedlloverride_update () { - if [ ! -z "${WINEDLLOVERRIDES}" ] - then export WINEDLLOVERRIDES="${1};${WINEDLLOVERRIDES}" - else export WINEDLLOVERRIDES="${1}" + if [ ! -z "$WINEDLLOVERRIDES" ] + then export WINEDLLOVERRIDES="$1;$WINEDLLOVERRIDES" + else export WINEDLLOVERRIDES="$1" fi return 0 } var_vkd3d_config_update () { - if [ ! -z "${VKD3D_CONFIG}" ] - then export VKD3D_CONFIG="${1};${VKD3D_CONFIG}" - else export VKD3D_CONFIG="${1}" + if [ ! -z "$VKD3D_CONFIG" ] + then export VKD3D_CONFIG="$1;$VKD3D_CONFIG" + else export VKD3D_CONFIG="$1" fi return 0 } var_radv_perftest_config_update () { - if [ ! -z "${RADV_PERFTEST}" ] - then export RADV_PERFTEST="${1};${RADV_PERFTEST}" - else export RADV_PERFTEST="${1}" + if [ ! -z "$RADV_PERFTEST" ] + then export RADV_PERFTEST="$1;$RADV_PERFTEST" + else export RADV_PERFTEST="$1" fi return 0 } var_vk_istance_layers_config_update () { - if [ ! -z "${PW_VK_INSTANCE_LAYERS}" ] - then export PW_VK_INSTANCE_LAYERS="${1}:${PW_VK_INSTANCE_LAYERS}" - else export PW_VK_INSTANCE_LAYERS="${1}" + if [ ! -z "$PW_VK_INSTANCE_LAYERS" ] + then export PW_VK_INSTANCE_LAYERS="$1:$PW_VK_INSTANCE_LAYERS" + else export PW_VK_INSTANCE_LAYERS="$1" fi return 0 } var_ld_library_path_update() { - if [ ! -z "${LD_LIBRARY_PATH}" ]; then - export LD_LIBRARY_PATH="$1:$LD_LIBRARY_PATH" - else - export LD_LIBRARY_PATH="$1" + if [ ! -z "$LD_LIBRARY_PATH" ] + then export LD_LIBRARY_PATH="$1:$LD_LIBRARY_PATH" + else export LD_LIBRARY_PATH="$1" fi return 0 } @@ -329,15 +328,14 @@ init_wine_ver () { IFS="$orig_IFS" fi if [[ -z `ls "${PORT_WINE_PATH}/data/dist/" | grep "${PW_WINE_USE}"` ]] ; then - if [[ ! -z `echo "${PW_WINE_USE}" | grep "PROTON_LG"` ]] ; then - export PW_WINE_USE=PROTON_LG - else - export PW_WINE_USE=PROTON_GE + if [[ "$PW_WINE_USE" =~ PROTON_LG* ]] + then export PW_WINE_USE=PROTON_LG + else export PW_WINE_USE=WINE_LG fi fi - if [[ ! -z `echo "${PW_WINE_USE}" | grep "^PROTON_LG$"` ]] + if [[ "$PW_WINE_USE" == PROTON_LG ]] then export PW_WINE_USE="${PW_PROTON_LG_VER}" - elif [[ ! -z `echo "${PW_WINE_USE}" | grep "^PROTON_GE$"` ]] + elif [[ "$PW_WINE_USE" == WINE_LG ]] then export PW_WINE_USE="${PW_WINE_LG_VER}" fi [ ! -z "${PW_WINE_VER}" ] && export PW_WINE_USE=`echo "${PW_WINE_VER}" | tr [[:lower:]] [[:upper:]]` @@ -690,9 +688,9 @@ pw_check_and_download_wine () { if [[ "${PW_WINE_USE}" == "GET-OTHER-WINE" ]] ; then gui_proton_downloader fi - if [[ $PW_WINE_USE == PROTON_LG ]] + if [[ "$PW_WINE_USE" == PROTON_LG ]] then export PW_WINE_USE="${PW_PROTON_LG_VER}" - elif [[ PW_WINE_USE == WINE_*_LG ]] + elif [[ "$PW_WINE_USE" == WINE_*_LG ]] || [[ "$PW_WINE_USE" == WINE_LG ]] then export PW_WINE_USE="${PW_WINE_LG_VER}" fi if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then @@ -827,7 +825,7 @@ pw_check_and_download_plugins () { } check_nvidia_rtx () { - if [[ $(echo "$LSPCI_VGA" | grep -i "nvidia") ]] ; then + if echo "$LSPCI_VGA" | grep -i "nvidia" &>/dev/null ; then # Turing (without nvidia 16XX) [[ "$LSPCI_VGA" == *TU[0-9]* ]] && [[ "$LSPCI_VGA" != *TU11[6-7]* ]] && return 0 # Ampere @@ -839,7 +837,7 @@ check_nvidia_rtx () { } check_hybrid_graphicks () { - if [[ $(echo "$LSPCI_VGA" | grep -i nvidia | grep -i -E '(intel|amd)') ]] + if echo "$LSPCI_VGA" | grep -i nvidia | grep -i -E '(intel|amd)' &>/dev/null then return 0 else return 1 fi diff --git a/data_from_portwine/scripts/portwine_db/02_setup_dotnet b/data_from_portwine/scripts/portwine_db/02_setup_dotnet deleted file mode 100755 index 3fbb0113..00000000 --- a/data_from_portwine/scripts/portwine_db/02_setup_dotnet +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash -#Author: linux-gaming.ru -#setup.exe -#Setup.exe -#SETUP.exe -#.msi -#Rating=5 -################################################ -export PW_DISABLED_CREATE_DB=1 -export PW_ICON_FOR_YAD="${PORT_WINE_PATH}/data/img/setup.png" -export PW_VULKAN_USE=1 -export PW_MANGOHUD=0 -export PW_NO_FSYNC=0 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. -export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives -export PW_WINEDBG_DISABLE=1 -export PW_USE_GAMEMODE=1 # Force disabele gamemod -export PW_FORCE_LARGE_ADDRESS_AWARE=1 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default. -export PW_DLL_INSTALL="" -export PW_PREFIX_NAME="DOTNET" - -add_in_stop_portwine () { - pw_find_exe news -} diff --git a/data_from_portwine/scripts/portwine_db/LOTF2 b/data_from_portwine/scripts/portwine_db/LOTF2 new file mode 100644 index 00000000..8f22b7a2 --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/LOTF2 @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +#Author: fidel +#LOTF2.exe +#Rating=5 +#####################examples########################### +export PW_WINE_USE="WINE_LG_8-18-1" diff --git a/data_from_portwine/scripts/portwine_db/VKPlayLoader b/data_from_portwine/scripts/portwine_db/VKPlayLoader index 85271025..a314774f 100755 --- a/data_from_portwine/scripts/portwine_db/VKPlayLoader +++ b/data_from_portwine/scripts/portwine_db/VKPlayLoader @@ -14,9 +14,9 @@ export PW_MUST_HAVE_DLL="" export PW_PREFIX_NAME="VK_PLAY" export PW_USE_GSTREAMER="1" export PW_VULKAN_USE="2" +export PW_WINE_USE="WINE_LG_8-18-1" -export PW_WINE_USE="WINE_8.5_LG" -gui_proton_downloader silent "WINE_8.5_LG" +gui_proton_downloader silent "$PW_WINE_USE" add_in_start_portwine () { if [[ -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/user.reg" ]] ; then diff --git a/data_from_portwine/scripts/portwine_db/lgc b/data_from_portwine/scripts/portwine_db/lgc index ffb999ce..8277d209 100755 --- a/data_from_portwine/scripts/portwine_db/lgc +++ b/data_from_portwine/scripts/portwine_db/lgc @@ -5,7 +5,6 @@ #Rating=5 export PW_COMMENT_DB="Lesta Game Centers" ################################################ -export PW_WINE_USE="PROTON_LG_8-4" export PW_VULKAN_USE=1 #dxvk, vkd3d or 0 for OpenGL export LAUNCH_PARAMETERS="" # Additional launch options export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP @@ -15,8 +14,6 @@ export PW_USE_D3D_EXTRAS="1" export PW_USE_EAC_AND_BE="0" export PW_PREFIX_NAME="LGC" -gui_proton_downloader silent "${PW_WINE_USE}" - add_in_start_portwine () { if [[ -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/${USER}/AppData/Roaming/Wargaming.net/WorldOfTanks/preferences.xml" ]] ; then sed -i 's% true % false %' "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/${USER}/AppData/Roaming/Wargaming.net/WorldOfTanks/preferences.xml" diff --git a/data_from_portwine/scripts/portwine_db/01_setup_standart b/data_from_portwine/scripts/portwine_db/setup similarity index 85% rename from data_from_portwine/scripts/portwine_db/01_setup_standart rename to data_from_portwine/scripts/portwine_db/setup index 6e7e39d9..d1de0d93 100755 --- a/data_from_portwine/scripts/portwine_db/01_setup_standart +++ b/data_from_portwine/scripts/portwine_db/setup @@ -10,10 +10,10 @@ export PW_DISABLED_CREATE_DB=1 export PW_ICON_FOR_YAD="${PORT_WINE_PATH}/data/img/setup.png" export PW_VULKAN_USE=1 export PW_MANGOHUD=0 -export PW_NO_FSYNC=0 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. +export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives export PW_WINEDBG_DISABLE=1 -export PW_USE_GAMEMODE=1 # Force disabele gamemod +export PW_USE_GAMEMODE=0 # Force disabele gamemod export PW_FORCE_LARGE_ADDRESS_AWARE=1 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default. export PW_DLL_INSTALL="" export WINEDLLOVERRIDES="mscoree,mshtml=" diff --git a/data_from_portwine/scripts/portwine_db/wgc b/data_from_portwine/scripts/portwine_db/wgc index 7a220655..861aeb18 100755 --- a/data_from_portwine/scripts/portwine_db/wgc +++ b/data_from_portwine/scripts/portwine_db/wgc @@ -5,7 +5,6 @@ #Rating=5 export PW_COMMENT_DB="Wargaming Game Centers" ################################################ -export PW_WINE_USE="PROTON_LG_8-4" export PW_VULKAN_USE=1 #dxvk, vkd3d or 0 for OpenGL export LAUNCH_PARAMETERS="" # Additional launch options export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP @@ -15,7 +14,6 @@ export PW_USE_D3D_EXTRAS="1" export PW_USE_EAC_AND_BE="0" export PW_PREFIX_NAME="WGC" -gui_proton_downloader silent "${PW_WINE_USE}" add_in_start_portwine () { if [[ -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/${USER}/AppData/Roaming/Wargaming.net/WorldOfTanks/preferences.xml" ]] ; then diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_LGC b/data_from_portwine/scripts/pw_autoinstall/PW_LGC index 950ea26f..db778f92 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_LGC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_LGC @@ -4,9 +4,6 @@ export LAUNCH_PARAMETERS=("/VERYSILENT") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Lesta_Game_Center_Install_RU.exe" export PW_PREFIX_NAME="LGC" -export PW_WINE_USE="PROTON_LG_8-4" - -gui_proton_downloader silent "${PW_WINE_USE}" start_portwine diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY b/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY index 1cba5793..47a8af85 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY +++ b/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY @@ -6,9 +6,6 @@ export PW_PREFIX_NAME="VK_PLAY" export PW_AUTOINSTALL_EXE="${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/steamuser/AppData/Local/VKPlayLoader.exe" export WINEDLLOVERRIDES="mscoree,mshtml=" export PW_MUST_HAVE_DLL="" -export PW_WINE_USE="WINE_8.5_LG" - -gui_proton_downloader silent "${PW_WINE_USE}" start_portwine if try_download "https://static.gc.my.games/VKPlayLoader.exe" "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_WGC b/data_from_portwine/scripts/pw_autoinstall/PW_WGC index d91953c8..4038fc9f 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_WGC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_WGC @@ -5,9 +5,7 @@ export LAUNCH_PARAMETERS=("/VERYSILENT") [ "${update_loc}" = "RUS" ] && export WGC_LOC=RU || export WGC_LOC=EU export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Wargaming_Game_Center_Install_WoT_${WGC_LOC}.exe" export PW_PREFIX_NAME="WGC" -export PW_WINE_USE="PROTON_LG_8-4" -gui_proton_downloader silent "${PW_WINE_USE}" start_portwine if try_download "https://redirect.wargaming.net/WGC/Wargaming_Game_Center_Install_WoT_${WGC_LOC}.exe" "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 81c1614f..0fceff95 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -661,7 +661,7 @@ else unset PW_GUI_DISABLED_CS fi unset MANGOHUD MANGOHUD_DLSYM PW_NO_ESYNC PW_NO_FSYNC PW_VULKAN_USE WINEDLLOVERRIDES PW_NO_WRITE_WATCH PW_YAD_SET PW_ICON_FOR_YAD -unset PW_CHECK_AUTOINSTAL PW_VKBASALT_EFFECTS PW_VKBASALT_FFX_CAS PORTWINE_DB PORTWINE_DB_FILE PW_DISABLED_CREATE_DB +unset PW_CHECK_AUTOINSTAL PW_VKBASALT_EFFECTS PW_VKBASALT_FFX_CAS PORTWINE_DB PORTWINE_DB_FILE PW_DISABLED_CREATE_DB RADV_PERFTEST unset CHK_SYMLINK_FILE MESA_GL_VERSION_OVERRIDE PATH_TO_GAME PW_START_DEBUG PORTPROTON_NAME PORTWINE_CREATE_SHORTCUT_NAME unset PW_PREFIX_NAME WINEPREFIX VULKAN_MOD PW_WINE_VER PW_ADD_TO_ARGS_IN_RUNTIME PW_GAMEMODERUN_SLR AMD_VULKAN_ICD PW_WINE_CPU_TOPOLOGY unset PW_NAME_D_NAME PW_NAME_D_ICON PW_NAME_D_EXEC PW_EXEC_FROM_DESKTOP PW_ALL_DF PW_GENERATE_BUTTONS PW_NAME_D_ICON PW_NAME_D_ICON_48 diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index aaea1012..dbf409f9 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -420,13 +420,14 @@ pw_create_prefix_backup () { if [[ -f "${PW_PREFIX_TO_BACKUP}/${PW_PREFIX_NAME}.ppack.part" ]] ; then mv -f "${PW_PREFIX_TO_BACKUP}/${PW_PREFIX_NAME}.ppack.part" "${PW_PREFIX_TO_BACKUP}/${PW_PREFIX_NAME}.ppack" zenity_info "$PW_PFX_BACKUP_SUCCESS" + if [[ ! -f "${PORT_WINE_TMP_PATH}/pfx_backup_info" ]] ; then + zenity_info "$PW_PFX_BACKUP_INFO" + echo "1" > "${PORT_WINE_TMP_PATH}/pfx_backup_info" + fi else zenity_error "$PW_PFX_BACKUP_ERROR" fi - if [[ ! -f "${PORT_WINE_TMP_PATH}/pfx_backup_info" ]]; then - zenity_info "$PW_PFX_BACKUP_INFO" - echo "1" > "${PORT_WINE_TMP_PATH}/pfx_backup_info" - fi + return 0 } @@ -734,7 +735,7 @@ else --field=" $loc_gui_clear_pfx"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_clear_pfx}":"FBTN" '@bash -c "button_click gui_clear_pfx"' \ --field=" $loc_gui_download_other_wine"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_download_other_wine}":"FBTN" '@bash -c "button_click gui_proton_downloader"' \ --field=" $loc_gui_wine_uninstaller"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_wineuninstaller}":"FBTN" '@bash -c "button_click gui_wine_uninstaller"' \ - --field=" $loc_gui_wine_cfg"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winecfg}":"FBTN" '@bash -c "button_click WINECFG"' \ + --field=" $loc_gui_wine_cfg "!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winecfg}":"FBTN" '@bash -c "button_click WINECFG"' \ --field=" $loc_gui_wine_file"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winefile}":"FBTN" '@bash -c "button_click WINEFILE"' \ --field=" $loc_gui_wine_cmd"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winecmd}":"FBTN" '@bash -c "button_click WINECMD"' \ --field=" $loc_gui_wine_reg"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winereg}":"FBTN" '@bash -c "button_click WINEREG"' 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" & diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index ada35a77..957e1307 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2226 +#SCRIPTS_NEXT_VERSION=2227 ######################################################################## export PW_MANGOHUD=0 export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt @@ -16,7 +16,7 @@ export PW_USE_TERMINAL="0" export PW_WINEDBG_DISABLE="1" export PW_WINDOWS_VER="10" export WINEARCH="win64" -export PW_LIBS_VER="_v44" +export PW_LIBS_VER="_v45" export GDK_BACKEND="x11" export PW_USE_GSTREAMER="1" export PW_USE_D3D_EXTRAS="1" @@ -38,12 +38,9 @@ export PW_USE_US_LAYOUT="0" export PW_WINE_USE="PROTON_LG" export PW_PLUGINS_VER="_v12" export PW_FAKE_DLSS_VER="230506" -###WINE_PROTON_LG### -export PW_LG_VER="8-17" -export PW_PROTON_LG_VER="PROTON_LG_${PW_LG_VER}" -###WINE_PROTON_GE### -export PW_WINE_LG_VER="8.5" -export PW_WINE_LG_VER="WINE_${PW_WINE_LG_VER}_LG" +###WINE_AND_PROTON_LG### +export PW_PROTON_LG_VER="PROTON_LG_8-20-1" +export PW_WINE_LG_VER="WINE_LG_8-18-1" export PW_WINE_FULLSCREEN_FSR="1" ###DXVK_AND_VKD3D### export VKD3D_LIMIT_TESS_FACTORS="32" diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui index e8e1a288..1098f7ad 100755 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -152,17 +152,17 @@ pw_gui_for_edit_db () { if echo "${MANGOHUD_CONFIG}" | grep "fps_limit" ; then FPS_LIMIT_VAR="$(echo ${MANGOHUD_CONFIG} | sed 's/.*fps_limit=//' | awk -F, '{print $1}')" else - FPS_LIMIT_VAR="$loc_disabled" + FPS_LIMIT_VAR="disabled" fi - if [[ ! -z "${PW_WINE_CPU_TOPOLOGY}" ]] && [[ "${PW_WINE_CPU_TOPOLOGY}" != "$loc_disabled" ]] ; then + if [[ ! -z "${PW_WINE_CPU_TOPOLOGY}" ]] && [[ "${PW_WINE_CPU_TOPOLOGY}" != "disabled" ]] ; then CPU_LIMIT_VAR="`echo ${PW_WINE_CPU_TOPOLOGY%%:*}`" else - CPU_LIMIT_VAR="$loc_disabled" + CPU_LIMIT_VAR="disabled" fi - if [[ ! -z "${PW_AMD_VULKAN_USE}" ]] && [[ "${PW_AMD_VULKAN_USE}" != "$loc_disabled" ]] ; then + if [[ ! -z "${PW_AMD_VULKAN_USE}" ]] && [[ "${PW_AMD_VULKAN_USE}" != "disabled" ]] ; then AMD_VULKAN_VAR="${PW_AMD_VULKAN_USE}" else - AMD_VULKAN_VAR="$loc_disabled" + AMD_VULKAN_VAR="disabled" fi GET_REFRASH_RATE="30!45!60!75!120!144!165!240" @@ -205,10 +205,10 @@ pw_gui_for_edit_db () { --field=":LBL" "" \ --field="${loc_gui_arg_exe}!${loc_gui_arg_exe_help} :CBE" "\\${LAUNCH_PARAMETERS[@]}!-dx11 -skipintro 1" \ --field=":LBL" "" \ - --field="${loc_gui_cpu_limit}!${loc_gui_cpu_limit_help} :CB" "${CPU_LIMIT_VAR}!${loc_disabled}!${GET_LOGICAL_CORE}" \ - --field="${loc_gui_amd_vulkan_select}!${loc_gui_amd_vulkan_select_help} :CB" "${AMD_VULKAN_VAR}!${loc_disabled}!amdvlk!amdgpupro!radv!radv_gpl!radv_aco" \ - --field="${loc_gui_mango_fps}!${loc_gui_mango_fps_help} :CB" "${FPS_LIMIT_VAR}!${loc_disabled}!${GET_REFRASH_RATE}" 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" 2>/dev/null & - "${pw_yad_v12_3}" --paned --key="$KEY_EDIT_DB_GUI" --title "EDIT_DB" --text-align=center --height="650" \ + --field="${loc_gui_cpu_limit}!${loc_gui_cpu_limit_help} :CB" "${CPU_LIMIT_VAR}!disabled!${GET_LOGICAL_CORE}" \ + --field="${loc_gui_amd_vulkan_select}!${loc_gui_amd_vulkan_select_help} :CB" "${AMD_VULKAN_VAR}!disabled!amdvlk!amdgpupro!radv!radv_gpl!radv_aco" \ + --field="${loc_gui_mango_fps}!${loc_gui_mango_fps_help} :CB" "${FPS_LIMIT_VAR}!disabled!${GET_REFRASH_RATE}" 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" 2>/dev/null & + "${pw_yad_v12_3}" --paned --key="$KEY_EDIT_DB_GUI" --title "EDIT_DB" --text-align=center --height="700" \ --text "${loc_gui_edit_db} ${PORTWINE_DB}\n ${loc_gui_edit_db_help}" --separator=" " --borders=3 \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ --button="${loc_gui_cancel}"!!"${loc_gui_cancel_help}":1 \ @@ -241,30 +241,32 @@ pw_gui_for_edit_db () { PW_AMD_VULKAN_USE="`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $8}'`" FPS_LIMIT="`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $9}'`" - if [[ "${FPS_LIMIT}" != "$loc_disabled" ]] && [[ "${FPS_LIMIT_VAR}" != "$loc_disabled" ]] ; then + if [[ "${FPS_LIMIT}" != "disabled" ]] && [[ "${FPS_LIMIT_VAR}" != "disabled" ]] ; then export MANGOHUD_CONFIG="$(echo ${MANGOHUD_CONFIG} | sed "s/fps_limit=${FPS_LIMIT_VAR}/fps_limit=${FPS_LIMIT}/")" export PW_MANGOHUD=1 - elif [[ "${FPS_LIMIT}" != "$loc_disabled" ]] && [[ "${FPS_LIMIT_VAR}" == "$loc_disabled" ]] ; then + elif [[ "${FPS_LIMIT}" != "disabled" ]] && [[ "${FPS_LIMIT_VAR}" == "disabled" ]] ; then export MANGOHUD_CONFIG=${MANGOHUD_CONFIG},fps_limit=${FPS_LIMIT} export PW_MANGOHUD=1 - elif [[ "${FPS_LIMIT}" == "$loc_disabled" ]] && [[ "${FPS_LIMIT_VAR}" != "$loc_disabled" ]] ; then + elif [[ "${FPS_LIMIT}" == "disabled" ]] && [[ "${FPS_LIMIT_VAR}" != "disabled" ]] ; then export MANGOHUD_CONFIG="$(echo ${MANGOHUD_CONFIG} | sed "s/,fps_limit=${FPS_LIMIT_VAR}//")" fi - if [[ "${CPU_LIMIT}" != "$loc_disabled" ]] ; then + if [[ "${CPU_LIMIT}" != "disabled" ]] ; then export PW_WINE_CPU_TOPOLOGY="${CPU_LIMIT}:$(seq -s, 0 $((${CPU_LIMIT} - 1)))" else - export PW_WINE_CPU_TOPOLOGY="$loc_disabled" + export PW_WINE_CPU_TOPOLOGY="disabled" fi if [[ "${PW_AMD_VULKAN_USE}" == "amdvlk" ]] ; then export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1 - if [[ $(grep -i -E '(rosa|redos|nobara|linuxmint|ubuntu|centos|rhel|fedora)' "/etc/os-release") ]] ; then + if grep -i -q -E '(rosa|redos|nobara|linuxmint|ubuntu|centos|rhel|fedora)' "/etc/os-release" ; then export VK_ICD_FILENAMES="/opt/amdgpu/etc/vulkan/icd.d/amd_icd32.json:/opt/amdgpu/etc/vulkan/icd.d/amd_icd64.json" + elif grep -i -q "altlinux" '/etc/os-release' ; then + export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/amd_icd.json" else export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/amd_icd32.json:/usr/share/vulkan/icd.d/amd_icd64.json" fi elif [[ "${PW_AMD_VULKAN_USE}" == "amdgpupro" ]] ; then export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1 - if [[ $(grep -i -E '(rosa|redos|nobara|linuxmint|ubuntu|centos|rhel|fedora)' "/etc/os-release") ]] ; then + if grep -i -q -E '(rosa|redos|nobara|linuxmint|ubuntu|centos|rhel|fedora)' "/etc/os-release" ; then export VK_ICD_FILENAMES="/opt/amdgpu-pro/etc/vulkan/icd.d/amd_icd32.json:/opt/amdgpu-pro/etc/vulkan/icd.d/amd_icd64.json" var_ld_library_path_update "/opt/amdgpu/libdrm/lib64:/opt/amdgpu/libdrm/lib32" else @@ -274,14 +276,12 @@ pw_gui_for_edit_db () { export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1 export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/radeon_icd.i686.json:/usr/share/vulkan/icd.d/radeon_icd.x86_64.json" elif [[ "${PW_AMD_VULKAN_USE}" == "radv_aco" ]] ; then - unset RADV_PERFTEST export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1 - export RADV_PERFTEST=aco + var_radv_perftest_config_update aco export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/radeon_icd.i686.json:/usr/share/vulkan/icd.d/radeon_icd.x86_64.json" elif [[ "${PW_AMD_VULKAN_USE}" == "radv_gpl" ]] ; then - unset RADV_PERFTEST export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1 - export RADV_PERFTEST=gpl + var_radv_perftest_config_update gpl export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/radeon_icd.i686.json:/usr/share/vulkan/icd.d/radeon_icd.x86_64.json" fi echo "pw_gui_for_edit_db PORTWINE_DB_FILE=$PORTWINE_DB_FILE"