forked from CastroFidel/PortWINE
fixed download for gamescope session
This commit is contained in:
parent
7d7ef7496a
commit
b5448116ae
@ -13,6 +13,7 @@ Changelog:
|
|||||||
* for "World of Sea Battle" language switching in the game has been fixed and the "DOTNET" prefix is no longer required
|
* for "World of Sea Battle" language switching in the game has been fixed and the "DOTNET" prefix is no longer required
|
||||||
* fixed determination of the selection of settings files when the exe file is a symbolic link
|
* fixed determination of the selection of settings files when the exe file is a symbolic link
|
||||||
* added returns to the main menu after canceling the reinstallation/uninstallation of PP, clearing the prefix and uninstalling programs (thanks to Htylol)
|
* added returns to the main menu after canceling the reinstallation/uninstallation of PP, clearing the prefix and uninstalling programs (thanks to Htylol)
|
||||||
|
* fixed launch of games/programs when using disabling the graphical interface (GUI_DISABLED_CS)
|
||||||
|
|
||||||
###Scripts version 2356### / stable / Date: 28.09.2024 / Download update size: 4 megabytes
|
###Scripts version 2356### / stable / Date: 28.09.2024 / Download update size: 4 megabytes
|
||||||
* fixed work in steam and ingame
|
* fixed work in steam and ingame
|
||||||
|
@ -13,6 +13,7 @@
|
|||||||
* для "World of Sea Battle" исправлено переключение языка в игре и больше не требуется префикс "DOTNET"
|
* для "World of Sea Battle" исправлено переключение языка в игре и больше не требуется префикс "DOTNET"
|
||||||
* исправлено определение выбора файлов настроек когда exe файл является символьной ссылкой
|
* исправлено определение выбора файлов настроек когда exe файл является символьной ссылкой
|
||||||
* добавлены возвраты в основное меню после отмены переустановки/удалении PP, чистки префикса и удаления программ (спасибо Htylol)
|
* добавлены возвраты в основное меню после отмены переустановки/удалении PP, чистки префикса и удаления программ (спасибо Htylol)
|
||||||
|
* исправлен запуск игр/программ при использовании отключения графического интерфейса (GUI_DISABLED_CS)
|
||||||
|
|
||||||
###Scripts version 2356### / stable / Дата: 28.09.2024 / Размер скачиваемого обновления: 4 мегабайт
|
###Scripts version 2356### / stable / Дата: 28.09.2024 / Размер скачиваемого обновления: 4 мегабайт
|
||||||
* исправлена работа в steam и ingame
|
* исправлена работа в steam и ingame
|
||||||
|
@ -996,22 +996,14 @@ init_wine_ver () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pw_init_runtime () {
|
pw_init_runtime () {
|
||||||
check_flatpak && export PW_USE_RUNTIME="0"
|
|
||||||
|
|
||||||
if [[ "$PW_USE_RUNTIME" != "1" ]] \
|
if [[ "$PW_USE_RUNTIME" != "1" ]] \
|
||||||
|| [[ "$PW_WINE_USE" == "USE_SYSTEM_WINE" ]]
|
|| [[ "$PW_WINE_USE" == "USE_SYSTEM_WINE" ]]
|
||||||
then
|
then
|
||||||
export PW_LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${PW_PLUGINS_PATH}/portable/lib/lib64:${PW_PLUGINS_PATH}/portable/lib/lib32"
|
export PW_LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${PW_PLUGINS_PATH}/portable/lib/lib64:${PW_PLUGINS_PATH}/portable/lib/lib32"
|
||||||
export PW_VK_LAYER_PATH="${PW_PLUGINS_PATH}/portable/share/vulkan/implicit_layer.d"
|
export PW_VK_LAYER_PATH="${PW_PLUGINS_PATH}/portable/share/vulkan/implicit_layer.d"
|
||||||
if check_flatpak
|
if [[ -z "$PW_TERM" ]] ; then
|
||||||
then
|
export PW_TERM="env LD_LIBRARY_PATH=\"${PW_LD_LIBRARY_PATH}\" ${PW_PLUGINS_PATH}/portable/bin/xterm -bg black -fg white -e"
|
||||||
if check_gamescope_session
|
|
||||||
then PW_TERM="xterm -fullscreen -bg black -fg white -e"
|
|
||||||
else PW_TERM="xterm -bg black -fg white -e"
|
|
||||||
fi
|
fi
|
||||||
else PW_TERM="env LD_LIBRARY_PATH=\"${PW_LD_LIBRARY_PATH}\" ${PW_PLUGINS_PATH}/portable/bin/xterm -bg black -fg white -e"
|
|
||||||
fi
|
|
||||||
export PW_TERM
|
|
||||||
export pw_runtime="env"
|
export pw_runtime="env"
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
@ -93,7 +93,7 @@ unset PW_PREFIX_NAME WINEPREFIX VULKAN_MOD PW_WINE_VER PW_ADD_TO_ARGS_IN_RUNTIME
|
|||||||
unset PW_NAME_D_NAME PW_NAME_D_ICON PW_NAME_D_EXEC PW_EXEC_FROM_DESKTOP PW_ALL_DF PW_GENERATE_BUTTONS PW_NAME_D_ICON PW_NAME_D_ICON_48
|
unset PW_NAME_D_NAME PW_NAME_D_ICON PW_NAME_D_EXEC PW_EXEC_FROM_DESKTOP PW_ALL_DF PW_GENERATE_BUTTONS PW_NAME_D_ICON PW_NAME_D_ICON_48
|
||||||
unset MANGOHUD_CONFIG FPS_LIMIT PW_WINE_USE WINEDLLPATH WINE WINEDIR WINELOADER WINESERVER PW_USE_RUNTIME PORTWINE_CREATE_SHORTCUT_NAME MIRROR
|
unset MANGOHUD_CONFIG FPS_LIMIT PW_WINE_USE WINEDLLPATH WINE WINEDIR WINELOADER WINESERVER PW_USE_RUNTIME PORTWINE_CREATE_SHORTCUT_NAME MIRROR
|
||||||
unset PW_LOCALE_SELECT PW_SETTINGS_INDICATION PW_GUI_START PW_AUTOINSTALL_EXE NOSTSTDIR RADV_DEBUG PW_NO_AUTO_CREATE_SHORTCUT
|
unset PW_LOCALE_SELECT PW_SETTINGS_INDICATION PW_GUI_START PW_AUTOINSTALL_EXE NOSTSTDIR RADV_DEBUG PW_NO_AUTO_CREATE_SHORTCUT
|
||||||
unset PW_DESKTOP_FILES_REGEX
|
unset PW_DESKTOP_FILES_REGEX PW_TERM
|
||||||
|
|
||||||
export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp"
|
export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp"
|
||||||
rm -f "$PORT_WINE_TMP_PATH"/*{exe,msi,tar}*
|
rm -f "$PORT_WINE_TMP_PATH"/*{exe,msi,tar}*
|
||||||
@ -263,20 +263,25 @@ fi
|
|||||||
|
|
||||||
# create lock file
|
# create lock file
|
||||||
if ! check_flatpak ; then
|
if ! check_flatpak ; then
|
||||||
if [[ -f "${PW_TMPFS_PATH}/portproton.lock" ]] ; then
|
if [[ -f "${PW_TMPFS_PATH}/portproton.lock" ]] ; then
|
||||||
print_warning "Found lock file: ${PW_TMPFS_PATH}/portproton.lock"
|
print_warning "Found lock file: ${PW_TMPFS_PATH}/portproton.lock"
|
||||||
yad_question "${translations[A running PortProton session was detected.\\nDo you want to end the previous session?]}" || exit 0
|
yad_question "${translations[A running PortProton session was detected.\\nDo you want to end the previous session?]}" || exit 0
|
||||||
fi
|
fi
|
||||||
touch "${PW_TMPFS_PATH}/portproton.lock"
|
touch "${PW_TMPFS_PATH}/portproton.lock"
|
||||||
rm_lock_file () {
|
rm_lock_file () {
|
||||||
echo "Removing the lock file..."
|
echo "Removing the lock file..."
|
||||||
rm -fv "${PW_TMPFS_PATH}/portproton.lock" && echo "OK"
|
rm -fv "${PW_TMPFS_PATH}/portproton.lock" && echo "OK"
|
||||||
}
|
}
|
||||||
trap "rm_lock_file" EXIT
|
trap "rm_lock_file" EXIT
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if check_flatpak
|
if check_flatpak ; then
|
||||||
then try_remove_dir "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}"
|
try_remove_dir "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}"
|
||||||
|
export PW_USE_RUNTIME="0"
|
||||||
|
if check_gamescope_session
|
||||||
|
then PW_TERM="xterm -fullscreen -bg black -fg white -e"
|
||||||
|
else PW_TERM="xterm -bg black -fg white -e"
|
||||||
|
fi
|
||||||
else pw_download_libs
|
else pw_download_libs
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user