From 89b8c3cfdb2ff9ab8a2bfc848777e05bf2384903 Mon Sep 17 00:00:00 2001 From: castro-fidel Date: Sun, 6 Feb 2022 18:30:04 +0300 Subject: [PATCH] Scripts version 2081 --- data_from_portwine/changelog_eng | 5 ++++- data_from_portwine/changelog_rus | 5 ++++- data_from_portwine/scripts/portwine_db/EoCApp | 2 -- .../scripts/portwine_db/League of Legends | 2 +- .../scripts/pw_autoinstall/PW_EPIC | 20 +++++++++---------- data_from_portwine/scripts/runlib | 9 +++++++-- data_from_portwine/scripts/var | 2 +- 7 files changed, 27 insertions(+), 18 deletions(-) diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index aee9d2a2..fcf04711 100644 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,9 @@ You can help us in the development of the project on the website: https://boosty ----------------------------------------- Changelog: +###Scripts version 2082### +* HOTFIX - AUTOINSTALL for EGS + ###Scripts version 2081### * fixed installing GOG Galaxy * update WINE PROTON_GE to 7.1-2 @@ -145,4 +148,4 @@ Changelog: * added checking and downloading the latest version of WINE for League of Legends before launching the game ###Scripts version 2050### -* HOTFIX - display WINE versions when creating a db file \ No newline at end of file +* HOTFIX - display WINE versions when creating a db file diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 5c036bef..20c257f8 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,9 @@ ----------------------------------------- История изменений: +###Scripts version 2082### +* HOTFIX - AUTOINSTALL для EGS + ###Scripts version 2081### * исправлена установка GOG при отсутствующем префиксе * проверен и обновлен WINE PROTON_GE_7.1-2 @@ -842,4 +845,4 @@ PS: не забывает для активации добавить перем ###ЗАМЕТКИ### * проверка версий dxvk на github: curl -s https://github.com/doitsujin/dxvk/releases | grep Version | awk {'print $3'} | sed 's%%%g' -* проверка версий vkd3d на github: curl -s https://github.com/HansKristian-Work/vkd3d-proton/releases | grep Version | awk {'print $3'} | sed 's%%%g' \ No newline at end of file +* проверка версий vkd3d на github: curl -s https://github.com/HansKristian-Work/vkd3d-proton/releases | grep Version | awk {'print $3'} | sed 's%%%g' diff --git a/data_from_portwine/scripts/portwine_db/EoCApp b/data_from_portwine/scripts/portwine_db/EoCApp index 92717e9c..30c919ce 100755 --- a/data_from_portwine/scripts/portwine_db/EoCApp +++ b/data_from_portwine/scripts/portwine_db/EoCApp @@ -19,8 +19,6 @@ export PW_FORCE_USE_VSYNC=0 export PW_VIRTUAL_DESKTOP=0 ##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue export ENABLE_VKBASALT=1 -export PW_VKBASALT_EFFECTS=cas:AmbientLight -export PW_VKBASALT_FFX_CAS=0 export PW_NO_FSYNC=1 export PW_NO_ESYNC=1 ##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games diff --git a/data_from_portwine/scripts/portwine_db/League of Legends b/data_from_portwine/scripts/portwine_db/League of Legends index 4eb730c5..d55cbbbf 100755 --- a/data_from_portwine/scripts/portwine_db/League of Legends +++ b/data_from_portwine/scripts/portwine_db/League of Legends @@ -87,7 +87,7 @@ check_port_for_lol () { add_in_start_portwine () { if [ "$(cat /proc/sys/abi/vsyscall32)" -ne 0 ] ; then 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 + --text='Root rights are required to execute the command: \n"sysctl -w abi.vsyscall32=0"' --no-wrap [ "$?" = 1 ] && exit 0 pkexec /usr/bin/env bash -c 'sysctl -w abi.vsyscall32=0' fi diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EPIC b/data_from_portwine/scripts/pw_autoinstall/PW_EPIC index 7a880372..94bcfb59 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EPIC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EPIC @@ -7,16 +7,16 @@ start_portwine if try_download "https://launcher-public-service-prod06.ol.epicgames.com/launcher/api/installer/download/EpicGamesLauncherInstaller.msi" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing Epic Games Launcher. Please wait..." - pw_kill_autostart EpicGamesLauncher.exe & - pw_run msiexec /i "${PW_AUTOINSTALL_EXE}" & - sleep 10 - if [ ! -z `pgrep msiexec* | head -n 1` ] ; then - while [ ! -z `pgrep msiexec* | head -n 1` ] || [ ! -z `pgrep rundll32* | head -n 1` ] || [ ! -z `pgrep -a wrap | grep ${portname} | head -n 1` ] - do - [ ! -z `pgrep rundll32* | head -n 1` ] && kill -n 9 `pgrep rundll32* | head -n 1` && echo "Kill rundll32.exe" - sleep 5 - done - fi +# pw_kill_autostart EpicGamesLauncher.exe & + pw_run msiexec /i "${PW_AUTOINSTALL_EXE}" +# sleep 10 +# if [ ! -z `pgrep msiexec* | head -n 1` ] ; then +# while [ ! -z `pgrep msiexec* | head -n 1` ] || [ ! -z `pgrep rundll32* | head -n 1` ] || [ ! -z `pgrep -a wrap | grep ${portname} | head -n 1` ] +# do +# [ ! -z `pgrep rundll32* | head -n 1` ] && kill -n 9 `pgrep rundll32* | head -n 1` && echo "Kill rundll32.exe" +# sleep 5 +# done +# fi portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Epic Games/Launcher/Portal/Binaries/Win32/EpicGamesLauncher.exe" try_remove_file "${PW_AUTOINSTALL_EXE}" kill_portwine diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 367c2e8e..1b715dea 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -475,6 +475,8 @@ start_portwine () { # fi ${pw_runtime} env PATH="${PATH}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" \ "${PORT_WINE_TMP_PATH}/winetricks" -q -r -f ${PW_DLL_NEED_INSTALL} &>>"${PORT_WINE_TMP_PATH}/update_pfx_log" + wait_wineserver + kill_portwine # if [ "${PW_WINE_VER_FROM_DB}" != "${PW_PROTON_STEAM_VER}" ] ; then # export PW_SILENT_RESTART=1 # /usr/bin/env bash ${pw_full_command_line[*]} & @@ -488,12 +490,15 @@ start_portwine () { fi ${pw_runtime} env PATH="${PATH}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" \ "${WINELOADER}" winecfg -v `echo "win${PW_WINDOWS_VER}" | sed 's/.*/\L&/'` - wait_wineserver && + wait_wineserver + kill_portwine echo "Set to win${PW_WINDOWS_VER}" fi pw_stop_progress_bar && pw_tray_icon && - pw_start_progress_bar_cover "${PW_GUI_ICON_PATH}/covers/pw_loading_cover.gif" && + if [[ "${PW_CHECK_AUTOINSTAL}" != "1" ]] ; then + pw_start_progress_bar_cover "${PW_GUI_ICON_PATH}/covers/pw_loading_cover.gif" + fi add_in_start_portwine } diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 366ce035..6f1260cf 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/bin/env bash #Author: Castro-Fidel (PortWINE-Linux.ru) -#SCRIPTS_NEXT_VERSION=2081 +#SCRIPTS_NEXT_VERSION=2082 #PORT_NEXT_VERSION=97 ######################################################################## export PW_MANGOHUD=1