From 58ce3196dc42bff1530ae4eb37c6964fa66a9ad0 Mon Sep 17 00:00:00 2001 From: castro-fidel Date: Sun, 3 Oct 2021 20:15:11 +0200 Subject: [PATCH] ###Scripts version 2014### --- data_from_portwine/changelog | 4 ++++ data_from_portwine/scripts/functions_helper | 2 +- .../scripts/portwine_db/League of Legends | 16 +++++++++------- data_from_portwine/scripts/var | 6 +++--- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog index 2c192024..a1be14f0 100755 --- a/data_from_portwine/changelog +++ b/data_from_portwine/changelog @@ -5,6 +5,10 @@ * добавить комментарии описывающие функционал скриптов и db файлов * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru ----------------------------------------- +###Scripts version 2014### +* обновлен WINE PROTON_STEAM до версии 6.3-7 совместно с DXVK и VKD3D +* реализован запуск League Of Legends (необходимо запускать с версией wine: https://github.com/Castro-Fidel/wine_builds/releases/download/WINE_LOL_GE_6.16-2/WINE_LOL_GE_6.16-2.tar.xz ) + ###Scripts version 2013### * добавлен автоматический перенос содержимого каталога ~/.PortWINE в ../PortProton/data/tmp * в лог созданный с помощью DEBAG добавлен вывод команды lspci | grep -i vga diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 8c5fdcc2..a6ae7c0c 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -471,7 +471,7 @@ pw_init_db () { . "${PORTWINE_DB_FILE}" print_info "Use ${PORTWINE_DB_FILE} db file." init_wine_ver - fi + fi fi # export PATH_TO_GAME="$( cd "$( dirname "${portwine_exe}" )" >/dev/null 2>&1 && pwd )" # export WIN_PATH_TO_GAME=`echo "C:${PATH_TO_GAME}" | sed "s%$WINEPREFIX%%g" | sed "s/drive_c//g" | sed 's#/#\\\#g'` diff --git a/data_from_portwine/scripts/portwine_db/League of Legends b/data_from_portwine/scripts/portwine_db/League of Legends index c14e334c..92511094 100755 --- a/data_from_portwine/scripts/portwine_db/League of Legends +++ b/data_from_portwine/scripts/portwine_db/League of Legends @@ -2,6 +2,8 @@ #Author: xuser #LeagueClient.exe #RiotClientServices.exe +#Install League of Legends ru.exe +#Install League of Legends euw.exe #Rating=1-5 #####################examples########################### export PW_COMMENT_DB="Check openssl in your system!" @@ -28,8 +30,8 @@ export PW_NO_ESYNC=1 # Do not use eventfd-based in-pr ##export PW_NO_WRITE_WATCH=1 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). ##export PW_HEAP_DELAY_FREE=1 ##export PW_WINE_ALLOW_XIM=1 # Disable XIM support until libx11 >= 1.7 is widespread -export WINEARCH=win32 # defaut = win64 -export WINEPREFIX="${PORT_WINE_PATH}/data/pfx_lol" +##export WINEARCH=win32 # defaut = win64 +##export WINEPREFIX="${PORT_WINE_PATH}/data/pfx_lol" export PW_MONO_VER="6.3.0" export PW_GECKO_VER="2.47.2" ##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG @@ -38,20 +40,20 @@ export PW_GECKO_VER="2.47.2" check_port_for_lol () { process=LeagueClientUx.exe - uxpid=$(timeout 2m sh -c "until pidof ${process}; do sleep 1; done") - if [[ ! -n $uxpid ]]; then + uxpid=$(timeout 2m /bin/bash -c "until pidof ${process}; do sleep 1; done") + if [ ! -n $uxpid ]; then echo "Could not find process ${process}" exit 1 fi echo "LeagueClientUx pid: ${uxpid}" port=$(xargs -0 < /proc/${uxpid}/cmdline | sed -n 's/.*--app-port=\([[:digit:]]*\).*/\1/p') - if [[ ! -n $port ]]; then + if [ ! -n $port ]; then echo "Could not find port" exit 1 fi echo "Waiting for port ${port}" kill -STOP ${uxpid} - timeout 5m sh -c " + timeout 5m /bin/bash -c " until openssl s_client -connect :${port} <<< Q > /dev/null 2>&1; do sleep 1 done" @@ -63,7 +65,7 @@ add_in_start_portwine () { zenity --question --title="Fix for LoL anti-cheat" \ --text='Root rights are required to execute the command: \n"sysctl -w abi.vsyscall32=0" and "sysctl -p"' --no-wrap [ "$?" = 1 ] && exit 0 - pkexec sh -c 'sysctl -w abi.vsyscall32=0 && sysctl -p' + pkexec /bin/bash -c 'sysctl -w abi.vsyscall32=0 && sysctl -p' fi check_port_for_lol & } \ No newline at end of file diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 4a31dd9e..df218872 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=2013 +#SCRIPTS_NEXT_VERSION=2014 #PORT_NEXT_VERSION=97 ######################################################################## export PW_MANGOHUD=1 @@ -25,11 +25,11 @@ export PW_MUST_HAVE_DLL="d3dx9_43 physx mfc42 vcrun2019 d3dcompiler_42 d3dcompil export PW_WINEDBG_DISABLE=1 export PW_WINDOWS_VER="10" export WINEARCH="win64" -export PW_LIBS_VER="_v17" +export PW_LIBS_VER="_v18" export PORTWINE_URL="http://portwine-linux.ru/" export GDK_BACKEND="x11" -export PW_PROTON_STEAM_VER="PROTON_STEAM_6.3-6C" +export PW_PROTON_STEAM_VER="PROTON_STEAM_6.3-7" export PW_PROTON_GE_VER="PROTON_GE_6.16-1" export PW_MONO_VER="6.3.0" export PW_GECKO_VER="2.47.2"