From 175a15393fd74187aff89904c2cb6ae0f3bd57c6 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Sun, 31 Mar 2024 13:08:33 +0300 Subject: [PATCH] Scripts version 2270 --- data_from_portwine/changelog_eng | 5 +++ data_from_portwine/changelog_rus | 5 +++ data_from_portwine/scripts/functions_helper | 4 ++- .../scripts/portwine_db/HorizonForbiddenWest | 5 ++- data_from_portwine/scripts/var | 2 +- data_from_portwine/scripts/yad_gui | 34 ++++++++++--------- 6 files changed, 36 insertions(+), 19 deletions(-) diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index d295a12e..0790ebbb 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,11 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2270### Date: 31.03.2024 / Download update size: 15 megabytes +* added support for the game Horizon Forbidden West (to apply, you need to run the exe of the game and select SETTINGS -> RESET SETTINGS) +* fixed the operation of WINE from Kron4ek and returned the ability to download it using GET-OTHER-WINE +* fixed the launch of GET-OTHER-WINE (the interface for downloading third-party versions of WINE-PROTON) when launching exe files + ###Scripts version 2269### Date: 29.03.2024 / Download update size: 15 megabytes * added improvements when using the system WINE * the preparation of PortProton scripts for working in flatpak has been completed diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index a12b4857..f65c99d1 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,11 @@ ----------------------------------------- История изменений: +###Scripts version 2270### Дата: 31.03.2024 / Размер скачиваемого обновления: 15 мегабайт +* добавлена поддержка игры Horizon Forbidden West (для применения необходимо запустить exe игры и выбрать НАСТРОЙКИ -> СБРОСИТЬ НАСТРОЙКИ) +* исправлена работа WINE от Kron4ek и возвращена возможность его скачивания с помощью GET-OTHER-WINE +* исправлен запуск GET-OTHER-WINE (интерфейс скачивания сторонних версий WINE-PROTON) при запуске exe файлов + ###Scripts version 2269### Дата: 29.03.2024 / Размер скачиваемого обновления: 15 мегабайт * добавлены улучшения при использовании cистемного WINE * завершена подготовка скриптов PortProton для работы во flatpak diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index f342a8c3..9b856358 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -427,6 +427,8 @@ check_user_conf () { init_wine_ver () { if [[ "${PW_WINE_VER}" == "USE_SYSTEM_WINE" ]] then export PW_WINE_USE="USE_SYSTEM_WINE" + elif [[ "${PW_WINE_VER}" == "GET-OTHER-WINE" ]] + then gui_proton_downloader elif [[ ! -z "${PW_WINE_VER}" ]] then export PW_WINE_USE="$PW_WINE_VER" fi @@ -541,7 +543,7 @@ init_wine_ver () { fi - if [[ "${PW_USE_GSTREAMER}" == 1 ]] ; then + if [[ "${PW_USE_GSTREAMER}" == 1 ]] ; then if [[ -d "${WINEDIR}/lib64/gstreamer-1.0" ]] ; then export GST_PLUGIN_SYSTEM_PATH_1_0="${WINEDIR}/lib64/gstreamer-1.0:${WINEDIR}/lib/gstreamer-1.0" fi diff --git a/data_from_portwine/scripts/portwine_db/HorizonForbiddenWest b/data_from_portwine/scripts/portwine_db/HorizonForbiddenWest index e1279ad6..5c153a94 100644 --- a/data_from_portwine/scripts/portwine_db/HorizonForbiddenWest +++ b/data_from_portwine/scripts/portwine_db/HorizonForbiddenWest @@ -1,8 +1,9 @@ #!/usr/bin/env bash #Author: fidel #HorizonForbiddenWest.exe -#Rating=1-5 +#Rating=5 #####################examples########################### +export PW_WINE_USE="WINE-9.5-AMD64" export PW_WINDOWS_VER="10" export PW_DLL_INSTALL="" export WINEDLLOVERRIDES="" @@ -13,3 +14,5 @@ export PW_FIX_VIDEO_IN_GAME="1" export PW_USE_SHADER_CACHE="0" export PW_USE_EAC_AND_BE="0" export LAUNCH_PARAMETERS="-EpicPortal" + +gui_proton_downloader silent "$PW_WINE_USE" diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 89f2dbfa..2ca657ee 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=2269 +#SCRIPTS_NEXT_VERSION=2270 ######################################################################## export PW_MANGOHUD="0" export DEFAULT_MANGOHUD_CONFIG="arch,cpu_mhz,cpu_temp,engine_version,gamemode,gpu_core_clock,gpu_mem_clock,gpu_name,gpu_temp,ram,resolution,vkbasalt,vram,vulkan_driver,wine" diff --git a/data_from_portwine/scripts/yad_gui b/data_from_portwine/scripts/yad_gui index edd8d8c8..886463b1 100755 --- a/data_from_portwine/scripts/yad_gui +++ b/data_from_portwine/scripts/yad_gui @@ -352,15 +352,15 @@ gui_proton_downloader () { fi # WINE_KRON4EK - # export WINE_KRON4EK=($(curl -s "https://api.github.com/repos/Kron4ek/Wine-Builds/releases" | grep "browser_download_url.*\.tar\.xz" | cut -d \" -f 4)) - # try_remove_file "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git" - # if [[ ! -z "${WINE_KRON4EK}" ]] ; then - # for PGEGIT in ${WINE_KRON4EK[@]} ; do - # echo ${PGEGIT} | awk -F/ '{print $NF}' | sed 's/.tar.xz//' >> "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git" - # done - # sed -i '/6.3/,$d' "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git" - # sed -i '/-x86/d' "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git" - # fi + export WINE_KRON4EK=($(curl -s "https://api.github.com/repos/Kron4ek/Wine-Builds/releases" | grep "browser_download_url.*\.tar\.xz" | cut -d \" -f 4)) + try_remove_file "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git" + if [[ ! -z "${WINE_KRON4EK}" ]] ; then + for PGEGIT in ${WINE_KRON4EK[@]} ; do + echo ${PGEGIT} | awk -F/ '{print $NF}' | sed 's/.tar.xz//' >> "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git" + done + sed -i '/6.3/,$d' "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git" + sed -i '/-x86/d' "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git" + fi # WINE_GE_CUSTOM export WINE_GE_CUSTOM=($(curl -s "https://api.github.com/repos/GloriousEggroll/wine-ge-custom/releases" | grep "browser_download_url.*\.tar\.xz" | cut -d \" -f 4)) @@ -392,7 +392,7 @@ gui_proton_downloader () { for INSTALLING_VERSION_IN_DIST in `ls "${PORT_WINE_PATH}/data/dist/"` ; do sed -i "/${INSTALLING_VERSION_IN_DIST}$/Id" "${PORT_WINE_TMP_PATH}/tmp_proton_ge_git" sed -i "/${INSTALLING_VERSION_IN_DIST}$/Id" "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git" - # sed -i "/${INSTALLING_VERSION_IN_DIST}$/Id" "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git" + sed -i "/${INSTALLING_VERSION_IN_DIST}$/Id" "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git" sed -i "/${INSTALLING_VERSION_IN_DIST}$/Id" "${PORT_WINE_TMP_PATH}/tmp_wine_ge_custom_git" done # Installed wine @@ -401,24 +401,24 @@ gui_proton_downloader () { # GUI export KEY_WINE=$RANDOM try_remove_file "${PORT_WINE_TMP_PATH}/tmp_proton_pw_set" - # try_remove_file "${PORT_WINE_TMP_PATH}/tmp_kron4ek_set" + try_remove_file "${PORT_WINE_TMP_PATH}/tmp_kron4ek_set" try_remove_file "${PORT_WINE_TMP_PATH}/tmp_proton_set" try_remove_file "${PORT_WINE_TMP_PATH}/tmp_ge_custom_set" try_remove_file "${PORT_WINE_TMP_PATH}/tmp_installed_wine_set" `"${pw_yad}" --plug=$KEY_WINE --tabnum=1 --list --separator="" --listen \ --column "$loc_gui_set_new_wine" < "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git" 1> "${PORT_WINE_TMP_PATH}/tmp_proton_pw_set" 2>/dev/null` & - # `"${pw_yad}" --plug=$KEY_WINE --tabnum=2 --list --separator="" --listen \ - # --column "$loc_gui_set_new_wine" < "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git" 1> "${PORT_WINE_TMP_PATH}/tmp_kron4ek_set" 2>/dev/null` & `"${pw_yad}" --plug=$KEY_WINE --tabnum=2 --list --separator="" --listen \ - --column "$loc_gui_set_new_wine" < "${PORT_WINE_TMP_PATH}/tmp_proton_ge_git" 1> "${PORT_WINE_TMP_PATH}/tmp_proton_set" 2>/dev/null` & + --column "$loc_gui_set_new_wine" < "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git" 1> "${PORT_WINE_TMP_PATH}/tmp_kron4ek_set" 2>/dev/null` & `"${pw_yad}" --plug=$KEY_WINE --tabnum=3 --list --separator="" --listen \ - --column "$loc_gui_set_new_wine" < "${PORT_WINE_TMP_PATH}/tmp_wine_ge_custom_git" 1> "${PORT_WINE_TMP_PATH}/tmp_ge_custom_set" 2>/dev/null` & + --column "$loc_gui_set_new_wine" < "${PORT_WINE_TMP_PATH}/tmp_proton_ge_git" 1> "${PORT_WINE_TMP_PATH}/tmp_proton_set" 2>/dev/null` & `"${pw_yad}" --plug=$KEY_WINE --tabnum=4 --list --separator="" --listen \ + --column "$loc_gui_set_new_wine" < "${PORT_WINE_TMP_PATH}/tmp_wine_ge_custom_git" 1> "${PORT_WINE_TMP_PATH}/tmp_ge_custom_set" 2>/dev/null` & + `"${pw_yad}" --plug=$KEY_WINE --tabnum=5 --list --separator="" --listen \ --column "$loc_gui_del_wine" < "${PORT_WINE_TMP_PATH}/tmp_installed_wine" 1> "${PORT_WINE_TMP_PATH}/tmp_installed_wine_set" 2>/dev/null` & `"${pw_yad}" --key=$KEY_WINE --notebook --width=500 --height=600 --text-align=center \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "WINE MANAGER" --separator="" \ - --tab-pos=top --tab="PROTON-LG" --tab="PROTON-GE" --tab="WINE-GE-CUSTOM" --tab="$loc_gui_installed_wine" 2>/dev/null` + --tab-pos=top --tab="PROTON-LG" --tab="WINE-KRON4EK" --tab="PROTON-GE" --tab="WINE-GE-CUSTOM" --tab="$loc_gui_installed_wine" 2>/dev/null` YAD_WINE_STATUS="$?" if [[ "$YAD_WINE_STATUS" == "1" || "$YAD_WINE_STATUS" == "252" ]] ; then export SKIP_CHECK_UPDATES=1 @@ -430,6 +430,8 @@ gui_proton_downloader () { export VERSION_WINE_GIT="`cat "${PORT_WINE_TMP_PATH}/tmp_proton_set"`" elif [ ! -z `cat "${PORT_WINE_TMP_PATH}/tmp_proton_pw_set" | awk '{print $1}'` ] ; then export VERSION_WINE_GIT="`cat "${PORT_WINE_TMP_PATH}/tmp_proton_pw_set"`" + elif [ ! -z `cat "${PORT_WINE_TMP_PATH}/tmp_kron4ek_set" | awk '{print $1}'` ] ; then + export VERSION_WINE_GIT="`cat "${PORT_WINE_TMP_PATH}/tmp_kron4ek_set"`" elif [ ! -z `cat "${PORT_WINE_TMP_PATH}/tmp_ge_custom_set" | awk '{print $1}'` ] ; then export VERSION_WINE_GIT="`cat "${PORT_WINE_TMP_PATH}/tmp_ge_custom_set"`" elif [ ! -z `cat "${PORT_WINE_TMP_PATH}/tmp_installed_wine_set" | awk '{print $1}'` ] ; then