diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index a6a3d5e..f114e6d 100755 --- 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://linux- ---------------------------------------- Changelog: +###Scripts version 2251### Date: 02.02.2024 / Download update size: 8 megabytes +* HOTFIX - fixed automatic closing of EAapp after its installation + ###Scripts version 2250### Date: 02.02.2024 / Download update size: 8 megabytes * fixed prefix adjustment and updating when starting from steam * fixed unpacking of WINE archives when starting from steam diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index a2af639..9dd6c84 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,9 @@ ----------------------------------------- История изменений: +###Scripts version 2251### Дата: 02.02.2024 / Размер скачиваемого обновления: 8 мегабайт +* HOTFIX - исправлено автоматическое закрытие EAapp после его установки на некоторых системах + ###Scripts version 2250### Дата: 02.02.2024 / Размер скачиваемого обновления: 8 мегабайт * исправлено добавление ярлыков в steam если имеется более одного каталога с пользователями в steam * исправлена подготавка префикса и его обновление при запуске из steam diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index b2394ed..1fc2d9a 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -610,13 +610,13 @@ pw_kill_autostart () { sleep 5 while true ; do - if [[ -z "`ps aux | grep -m 1 "$1" | grep -v grep | awk '{print $2}'`" ]] && [[ ! -z "`ps aux | grep wrap | grep -v grep | grep -i ${portname} | head -n 1`" ]] ; then + if [[ -z "`ps aux | grep -m 1 -i "$1" | grep -v grep | awk '{print $2}'`" ]] && [[ ! -z "`ps aux | grep wrap | grep -v grep | grep -i ${portname} | head -n 1`" ]] ; then echo -e "PID "$1" not found" sleep "${SWAIT}" else sleep "${SWAIT}" if [[ "$3" == please ]] - then kill -s SIGTERM `ps aux | grep -m 1 "$1" | grep -v grep | awk '{print $2}'` + then kill -s SIGTERM `ps aux | grep -m 1 -i "$1" | grep -v grep | awk '{print $2}'` else kill_portwine fi break diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP b/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP index 08f81e9..79bf597 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP @@ -13,7 +13,7 @@ start_portwine if try_download_game "https://origin-a.akamaihd.net/EA-Desktop-Client-Download/installer-releases/EAappInstaller.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} EA Launcher. ${loc_gui_please_wait} " - pw_kill_autostart EABackgroundService.exe 5 please & + pw_kill_autostart EABackgroundSer 5 please & mkdir -p "$WINEPREFIX/drive_c/Program Files/Electronic Arts/EA Desktop/EA Desktop" pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/Program Files/Electronic Arts/EA Desktop/EA Desktop/EALauncher.exe" diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 642d5e4..3ab0418 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=2250 +#SCRIPTS_NEXT_VERSION=2251 ######################################################################## export PW_MANGOHUD="0" export DEFAULT_MANGOHUD_CONFIG="cpu_stats,cpu_temp,cpu_mhz,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,vram,ram,frame_timing=1,time,arch,wine,toggle_hud=Shift_R+F12,resolution,vkbasalt,gamemode"