Scripts version 2081

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
+* HOTFIX - display WINE versions when creating a db file

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%</a>%%g'
-* проверка версий vkd3d на github: curl -s https://github.com/HansKristian-Work/vkd3d-proton/releases | grep Version | awk {'print $3'} | sed 's%</a>%%g'
+* проверка версий vkd3d на github: curl -s https://github.com/HansKristian-Work/vkd3d-proton/releases | grep Version | awk {'print $3'} | sed 's%</a>%%g'

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

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

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_kill_autostart EpicGamesLauncher.exe &
-    pw_run msiexec /i "${PW_AUTOINSTALL_EXE}" &
+    pw_run msiexec /i "${PW_AUTOINSTALL_EXE}"
-    sleep 10
+#     sleep 10
-    if [ ! -z `pgrep msiexec* | head -n 1` ] ; then
+#     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` ]
+#         while [ ! -z `pgrep msiexec* | head -n 1` ] || [ ! -z `pgrep rundll32* | head -n 1` ] || [ ! -z `pgrep -a wrap | grep ${portname} | head -n 1` ]
-        do
+#         do
-            [ ! -z `pgrep rundll32* | head -n 1` ] && kill -n 9 `pgrep rundll32* | head -n 1` && echo "Kill rundll32.exe"
+#             [ ! -z `pgrep rundll32* | head -n 1` ] && kill -n 9 `pgrep rundll32* | head -n 1` && echo "Kill rundll32.exe"
-            sleep 5
+#             sleep 5
-        done
+#         done
-    fi
+#     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

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
 }
 

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