CastroFidel/PortWINE
3
2
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Boria138-alphine' into devel

Browse Source
This commit is contained in:
Mikhail Tergoev 2024-09-04 14:08:08 +03:00
commit d70031de88
4 changed files with 40 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
data_from_portwine/changelog_en
View File

@ -2,6 +2,15 @@ You can help us in the development of the project on the website: https://linux-
----------------------------------------
Changelog:
###Scripts version 2343### / Date: 04.09.2024 / Download update size: 190 megabytes
* updated PROTON_LG to version "9-12"
* updated versions:
* DXVK_GIT "2.4-37"
* VKD3D_GIT "1.1-4167"
* improved support for flatpak version of PortProton for Alpine Linux (thanks to Boria138)
* fixed tray for WM: BSPWM (thanks to Htylol)
* fixed launch of some bat files (thanks to Htylol)
###Scripts version 2342### / stable / Date: 30.08.2024 / Download update size: 385 megabytes
* cumulative update to the stable version of PortProton scripts

4
data_from_portwine/changelog_ru
View File

@ -2,10 +2,14 @@
-----------------------------------------
История изменений:
###Scripts version 2343### / Дата: 04.09.2024 / Размер скачиваемого обновления: 190 мегабайт
* обновлен PROTON_LG до версии "9-12"
* обновлены версии:
* DXVK_GIT "2.4-37"
* VKD3D_GIT "1.1-4167"
* улучшена поддержка flatpak версии PortProton для Alpine Linux (спасибо Boria138)
* исправлен трей для WM: BSPWM (спасибо Htylol)
* исправлен запуск некоторых bat файлов (спасибо Htylol)
###Scripts version 2342### / stable / Дата: 30.08.2024 / Размер скачиваемого обновления: 385 мегабайт
* кумулятивное обновление стабильной версии скриптов PortProton

48
data_from_portwine/scripts/functions_helper
View File

@ -519,6 +519,9 @@ check_flatpak () {
fi
if grep -i "flatpak" /etc/os-release &>/dev/null ; then
export FLATPAK_IN_USE=1
if grep -i "Alpine Linux" "/run/host/etc/os-release" &>/dev/null ; then
export ALPINE_FP=1
fi
return 0
else
export FLATPAK_IN_USE=0
@ -981,7 +984,7 @@ regdlloverrides () {
}
wait_wineserver () {
while ls -l /proc/*/exe 2>/dev/null | grep -ie PortProton | grep -E 'wine(64)?-preloader|wineserver'
while ls -l /proc/*/exe >/dev/null 2>&1 | grep -ie PortProton | grep -E 'wine(64)?-preloader|wineserver'
do
sleep 1
done
@ -992,27 +995,25 @@ export -f wait_wineserver
kill_portwine () {
if [[ "${PW_WINE_USE}" != "USE_SYSTEM_WINE" ]] ; then
wine_pids="$(ls -l /proc/*/exe 2>/dev/null | grep -ie PortProton | grep -E 'wine(64)?-preloader|wineserver' | awk -F/ '{print $3}')"
for pw_kill_pids in ${wine_pids} ; do
if ps cax | grep "${pw_kill_pids}" ; then
kill -n 9 "${pw_kill_pids}" &>/dev/null
fi
done
bwrap_pids="$(pgrep -a wrap | grep PortProton | head -n 1 | awk '{print $1}')"
for pw_kill_pids in ${bwrap_pids} ; do
if ps cax | grep "${pw_kill_pids}" ; then
kill -n 9 "${pw_kill_pids}" &>/dev/null
fi
done
check_flatpak
if [[ "$ALPINE_FP" == "1" ]] ; then
wine_pids=$(ls -l /proc/*/exe >/dev/null 2>&1 | grep -ie PortProton | grep -E 'wine(64)?-preloader|wineserver' | awk -F/ '{print $3}')
bwrap_pids=$(pgrep -f wrap | grep PortProton | head -n 1)
else
wine_pids=$(ls -l /proc/*/exe 2>/dev/null | grep -ie PortProton | grep -E 'wine(64)?-preloader|wineserver' | awk -F/ '{print $3}')
bwrap_pids="$(pgrep -a wrap | grep PortProton | head -n 1 | awk '{print $1}')"
fi
else
wine_pids="$(ls -l /proc/*/exe 2>/dev/null | grep -E 'wine(64)?-preloader|wineserver' | awk -F/ '{print $3}')"
for pw_kill_pids in ${wine_pids} ; do
if ps cax | grep "${pw_kill_pids}" ; then
kill -n 9 "${pw_kill_pids}" &>/dev/null
fi
done
wine_pids=$(ls -l /proc/*/exe 2>/dev/null | grep -E 'wine(64)?-preloader|wineserver' | awk -F/ '{print $3}')
unset bwrap_pids
fi
for pw_kill_pids in ${bwrap_pids} ${wine_pids}; do
if ps cax | grep "${pw_kill_pids}" ; then
kill -n 9 "${pw_kill_pids}" &>/dev/null
fi
done
return 0
}
export -f kill_portwine
@ -2184,7 +2185,9 @@ start_portwine () {
if check_gamescope_session ; then
export PW_GAMEMODERUN_SLR=""
elif [[ "$PW_USE_GAMEMODE" = "1" ]] ; then
elif [[ "$PW_USE_GAMEMODE" = "1" ]] \
&& [[ ! -z "$DBUS_SESSION_BUS_ADDRESS" ]]
then
if command -v gamemoded &>/dev/null ; then
export GAMEMODERUN=1
PW_GAMEMODERUN_SLR="gamemoderun"
@ -4736,7 +4739,8 @@ resize_png () {
if check_flatpak ; then
if ! timeout 3 \
exe-thumbnailer --force-resize -s "$RESIZE_TO" "$(readlink -f "${RESIZE_FILE}")" "${PORT_WINE_PATH}/data/img/${RESIZE_NAME_PNG}.png" 2>/dev/null
exe-thumbnailer --force-resize -s "$RESIZE_TO" "$(readlink -f "${RESIZE_FILE}")" "${PORT_WINE_PATH}/data/img/${RESIZE_NAME_PNG}.png" \
&& [[ "$ALPINE_FP" != "1" ]]
then
print_error "exe-thumbnailer - broken!"
if [[ ! -z $PW_DEBUG ]] ; then

2
data_from_portwine/scripts/var
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash
#Author: Castro-Fidel (linux-gaming.ru)
#SCRIPTS_NEXT_VERSION=2342
#SCRIPTS_NEXT_VERSION=2343
#SCRIPTS_STABLE_VERSION=2342
########################################################################
# export PROTON_USE_XALIA="1"