Skip to content

P
PortWINE
Commit 1280cb9a authored by Mikhail Tergoev's avatar Mikhail Tergoev
Browse files
Options

Scripts version 2262

parent cc3fdaf8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 141 additions and 67 deletions
data_from_portwine/changelog_eng
View file @ 1280cb9a
...@@ -2,6 +2,17 @@ You can help us in the development of the project on the website: https://linux- ...@@ -2,6 +2,17 @@ You can help us in the development of the project on the website: https://linux-
---------------------------------------- ----------------------------------------
Changelog: Changelog:
###Scripts version 2262### Date: 14.03.2024 / Download update size: 230 megabytes
* added a warning when starting the second PortProton session
* added the ability to disable the container
* added the ability to use system WINE
* updated PROTON_LG to version 9-1
* updated versions:
DXVK_GIT "2.3-90"
VKD3D_GIT "1.1-3954"
* fixed installation of libraries from the prefix manager on openSUSE OS (thanks to Boria138)
* a separate version of PROTON is no longer required for Black Desert Online
###Scripts version 2261### Date: 07.03.2024 / Download update size: 15 megabytes ###Scripts version 2261### Date: 07.03.2024 / Download update size: 15 megabytes
* HOTFIX - use settings from Black Desert Online launcher * HOTFIX - use settings from Black Desert Online launcher
......
data_from_portwine/changelog_rus
View file @ 1280cb9a
...@@ -2,10 +2,15 @@ ...@@ -2,10 +2,15 @@
----------------------------------------- -----------------------------------------
История изменений: История изменений:
###Scripts version 2262### Дата: 14.03.2024 / Размер скачиваемого обновления: 230 мегабайт
* добавлено предупреждение при запуске второй сессии PortProton
* добавлена возможность отключения контейнера
* добавлена возможность использования системного WINE
* обновлен PROTON_LG до версии 9-1 * обновлен PROTON_LG до версии 9-1
* обновлены версии: * обновлены версии:
DXVK_GIT "2.3-90" DXVK_GIT "2.3-90"
VKD3D_GIT "1.1-3954" VKD3D_GIT "1.1-3954"
* исправлена установка библиотек из префикс менеджера на ОС "OpenSUSE" (спасибо Boria138)
* для Black Desert Online более не требуется отдельной версии PROTON * для Black Desert Online более не требуется отдельной версии PROTON
###Scripts version 2261### Дата: 07.03.2024 / Размер скачиваемого обновления: 15 мегабайт ###Scripts version 2261### Дата: 07.03.2024 / Размер скачиваемого обновления: 15 мегабайт
......
data_from_portwine/scripts/lang
View file @ 1280cb9a
...@@ -128,6 +128,8 @@ if [[ "${update_loc}" == "RUS" ]] ; then ...@@ -128,6 +128,8 @@ if [[ "${update_loc}" == "RUS" ]] ; then
export loc_gui_dll_new_pfx="Установить рекомендованные библиотеки в новый префикс: " export loc_gui_dll_new_pfx="Установить рекомендованные библиотеки в новый префикс: "
export loc_gui_portproton_lock='Завершите предыдущую сессию PortProton перед запуском новой,\nили воспользуйтесь ПКМ на значке в трее -> Завершить работу PortProton.'
export ENABLE_VKBASALT_INFO='Включить vkBasalt по умолчанию для улучшение графики в играх работающих под Vulkan. (Горячая клавиша HOME отключает vkbasalt)' export ENABLE_VKBASALT_INFO='Включить vkBasalt по умолчанию для улучшение графики в играх работающих под Vulkan. (Горячая клавиша HOME отключает vkbasalt)'
export PW_NO_ESYNC_INFO='Не использовать примитивы внутрипроцессной синхронизации на основе eventfd. (Рекомендуется не изменять значение)' export PW_NO_ESYNC_INFO='Не использовать примитивы внутрипроцессной синхронизации на основе eventfd. (Рекомендуется не изменять значение)'
export PW_NO_FSYNC_INFO='Не использовать примитивы внутрипроцессной синхронизации на основе фьютексов. (Автоматически отключается в системах без FUTEX_WAIT_MULTIPLE поддержки) (Рекомендуется не изменять значение)' export PW_NO_FSYNC_INFO='Не использовать примитивы внутрипроцессной синхронизации на основе фьютексов. (Автоматически отключается в системах без FUTEX_WAIT_MULTIPLE поддержки) (Рекомендуется не изменять значение)'
...@@ -280,8 +282,8 @@ if [[ "${update_loc}" == "RUS" ]] ; then ...@@ -280,8 +282,8 @@ if [[ "${update_loc}" == "RUS" ]] ; then
export PW_MH_wine_INFO='Показать используемую версию Wine или Proton' export PW_MH_wine_INFO='Показать используемую версию Wine или Proton'
export PW_PFX_BACKUP_INFO="Внимание! Не передавайте резевную копию третьим лицам, есть риск потери аккаунтов" export PW_PFX_BACKUP_INFO="Внимание! Не передавайте резевную копию третьим лицам, есть риск потери аккаунтов"
export PW_PFX_BACKUP_SUCCESS="Резервная копия префикса: \"${PW_PREFIX_NAME}\" успешно создана" export PW_PFX_BACKUP_SUCCESS="Успешно создана резервная копия префикса:"
export PW_PFX_BACKUP_ERROR="Во время создания резервной копии префикса: \"${PW_PREFIX_NAME}\" произошла ошибка" export PW_PFX_BACKUP_ERROR="Произошла ошибка во время создания резервной копии префикса:"
export loc_find_d3dadapter9_error="не найден в системе.\nУстановите недостающий пакет: </Sb>d3dadapter9</b>" export loc_find_d3dadapter9_error="не найден в системе.\nУстановите недостающий пакет: </Sb>d3dadapter9</b>"
...@@ -537,6 +539,8 @@ elif [[ "${update_loc}" == "ENG" ]] ; then ...@@ -537,6 +539,8 @@ elif [[ "${update_loc}" == "ENG" ]] ; then
export loc_gui_dll_new_pfx="Do you want to installing recommended libraries in the new prefix: " export loc_gui_dll_new_pfx="Do you want to installing recommended libraries in the new prefix: "
export loc_gui_portproton_lock='End the previous PortProton session before starting a new one,\nor use the RMB on the tray icon -> Shut down PortProton.'
export ENABLE_VKBASALT_INFO='Enable vkBasalt by default to improve graphics in games running on Vulkan. (The HOME hotkey disables vkbasalt)' export ENABLE_VKBASALT_INFO='Enable vkBasalt by default to improve graphics in games running on Vulkan. (The HOME hotkey disables vkbasalt)'
export PW_NO_ESYNC_INFO='Do not use in-process synchronization primitives based on eventfd. (It is recommended not to change the value.)' export PW_NO_ESYNC_INFO='Do not use in-process synchronization primitives based on eventfd. (It is recommended not to change the value.)'
export PW_NO_FSYNC_INFO='Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems without FUTEX_WAIT_MULTIPLE support) (It is recommended not to change the value)' export PW_NO_FSYNC_INFO='Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems without FUTEX_WAIT_MULTIPLE support) (It is recommended not to change the value)'
...@@ -689,8 +693,8 @@ elif [[ "${update_loc}" == "ENG" ]] ; then ...@@ -689,8 +693,8 @@ elif [[ "${update_loc}" == "ENG" ]] ; then
export PW_MH_wine_INFO='Show current Wine or Proton version in use' export PW_MH_wine_INFO='Show current Wine or Proton version in use'
export PW_PFX_BACKUP_INFO="Attention! Do not pass the resev copy to third parties, there is a risk of losing accounts" export PW_PFX_BACKUP_INFO="Attention! Do not pass the resev copy to third parties, there is a risk of losing accounts"
export PW_PFX_BACKUP_SUCCESS="Prefix backup: \"${PW_PREFIX_NAME}\" has been successfully created" export PW_PFX_BACKUP_SUCCESS="Backup has been successfully created for prefix:"
export PW_PFX_BACKUP_ERROR="An error occurred while backing up the prefix: \"${PW_PREFIX_NAME}\" error occurred" export PW_PFX_BACKUP_ERROR="An error occurred while backing up the prefix:"
export loc_find_d3dadapter9_error="Not found in the system.\nInstall the missing package: </Sb>d3dadapter9</b>" export loc_find_d3dadapter9_error="Not found in the system.\nInstall the missing package: </Sb>d3dadapter9</b>"
......
data_from_portwine/scripts/runlib
View file @ 1280cb9a
...@@ -50,10 +50,12 @@ start_portwine () { ...@@ -50,10 +50,12 @@ start_portwine () {
var_winedlloverride_update "${PW_MUST_WINEDLLOVERRIDES}" var_winedlloverride_update "${PW_MUST_WINEDLLOVERRIDES}"
pw_list_install_dll_in_prefix pw_list_install_dll_in_prefix
pw_check_and_download_wine "${PW_WINE_USE}" if [[ "${PW_WINE_USE}" != "USE_SYSTEM_WINE" ]]
then pw_check_and_download_wine "${PW_WINE_USE}"
fi
init_wine_ver init_wine_ver
pw_init_runtime pw_init_runtime
check_variables VKD3D_DEBUG none check_variables VKD3D_DEBUG none
check_variables DXVK_LOG_LEVEL none check_variables DXVK_LOG_LEVEL none
check_variables VK_LOADER_DEBUG none check_variables VK_LOADER_DEBUG none
...@@ -330,7 +332,7 @@ start_portwine () { ...@@ -330,7 +332,7 @@ start_portwine () {
PW_GAMEMODERUN_SLR="gamemoderun" PW_GAMEMODERUN_SLR="gamemoderun"
systemctl enable --now --user gamemoded &>/dev/null systemctl enable --now --user gamemoded &>/dev/null
print_info "Gamemod will be launched." print_info "Gamemod will be launched."
else elif [[ "$PW_USE_RUNTIME" == 1 ]] ; then
export GAMEMODERUN=1 export GAMEMODERUN=1
if ! pidof gamemoded &>/dev/null ; then if ! pidof gamemoded &>/dev/null ; then
GAMEMODEAUTO_NAME="libgamemodeauto.so.0" GAMEMODEAUTO_NAME="libgamemodeauto.so.0"
...@@ -345,6 +347,9 @@ start_portwine () { ...@@ -345,6 +347,9 @@ start_portwine () {
print_info "Gamemod will be launched." print_info "Gamemod will be launched."
sleep 0.1 sleep 0.1
fi fi
else
export GAMEMODERUN=0
export PW_GAMEMODERUN_SLR=""
fi fi
else else
export GAMEMODERUN=0 export GAMEMODERUN=0
...@@ -654,6 +659,9 @@ start_portwine () { ...@@ -654,6 +659,9 @@ start_portwine () {
gsettings set org.cinnamon.muffin unredirect-fullscreen-windows true gsettings set org.cinnamon.muffin unredirect-fullscreen-windows true
fi fi
fi fi
pw_mangohud_check
pw_vkbasalt_check
} }
pw_run () { pw_run () {
...@@ -666,55 +674,88 @@ pw_run () { ...@@ -666,55 +674,88 @@ pw_run () {
else else
cd "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c" cd "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c"
fi fi
pw_mangohud_check
pw_vkbasalt_check
PW_LOG_TO_FILE="${PORT_WINE_PATH}/${portname}.log" PW_LOG_TO_FILE="${PORT_WINE_PATH}/${portname}.log"
print_var "WINEDIR" "WINEPREFIX" "WINEDLLOVERRIDES" "PATH_TO_GAME" "PW_WINE_USE" "PW_VULKAN_USE" "VULKAN_DRIVER_NAME" print_var "WINEDIR" "WINEPREFIX" "WINEDLLOVERRIDES" "PATH_TO_GAME" "PW_WINE_USE" "PW_VULKAN_USE" "VULKAN_DRIVER_NAME"
print_var "VULKAN_API_DRIVER_VERSION" "VKD3D_CONFIG" "PW_LD_LIBRARY_PATH" "PATH" "WINEESYNC" "WINEFSYNC" "WINEFSYNC_FUTEX2" print_var "VULKAN_API_DRIVER_VERSION" "VKD3D_CONFIG" "PW_LD_LIBRARY_PATH" "PATH" "WINEESYNC" "WINEFSYNC" "WINEFSYNC_FUTEX2"
print_var "WINEDLLPATH" "WINE_CPU_TOPOLOGY" "PW_RUN_GAMESCOPE" "LD_LIBRARY_PATH" print_var "WINEDLLPATH" "WINE_CPU_TOPOLOGY" "PW_RUN_GAMESCOPE" "LD_LIBRARY_PATH"
kill -s SIGUSR1 "$PW_YAD_PID_PFX_COVER_UI" &>/dev/null kill -s SIGUSR1 "$PW_YAD_PID_PFX_COVER_UI" &>/dev/null
if [[ "${PW_LOG}" == 1 ]] ; then if [[ "$PW_USE_RUNTIME" == 1 ]] ; then
if check_start_from_steam ; then if [[ "${PW_LOG}" == 1 ]] ; then
for VAR_LOGGER in PW_WINE_USE WINEDIR WINEDLLPATH WINEPREFIX PATH_TO_GAME PW_VULKAN_USE PW_LD_LIBRARY_PATH LD_LIBRARY_PATH PATH \ if check_start_from_steam ; then
VKD3D_CONFIG WINEESYNC WINEFSYNC WINEFSYNC_FUTEX2 WINE_CPU_TOPOLOGY DESKTOP_SESSION for VAR_LOGGER in PW_WINE_USE WINEDIR WINEDLLPATH WINEPREFIX PATH_TO_GAME PW_VULKAN_USE PW_LD_LIBRARY_PATH LD_LIBRARY_PATH PATH \
do VKD3D_CONFIG WINEESYNC WINEFSYNC WINEFSYNC_FUTEX2 WINE_CPU_TOPOLOGY DESKTOP_SESSION
echo "${VAR_LOGGER}=${!VAR_LOGGER}" >> "${PW_LOG_TO_FILE}" do
done echo "${VAR_LOGGER}=${!VAR_LOGGER}" >> "${PW_LOG_TO_FILE}"
done
fi
echo "WINEDLLOVERRIDES=${WINEDLLOVERRIDES}" >> "${PW_LOG_TO_FILE}"
echo "------------------------------------" >> "${PW_LOG_TO_FILE}"
echo "Log WINE:" >> "${PW_LOG_TO_FILE}"
echo ""
print_info "Log from RUNTIME and WINE:"
${PW_RUN_GAMESCOPE} \
${pw_runtime} \
env PATH="${PATH}" \
LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \
LD_PRELOAD="${PW_LD_PRELOAD}" \
VK_LAYER_PATH="${PW_VK_LAYER_PATH}" \
VK_INSTANCE_LAYERS=${PW_VK_INSTANCE_LAYERS} \
${PW_GAMEMODERUN_SLR} \
${PW_MANGOHUD_SLR} \
"${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} &>>"${PW_LOG_TO_FILE}"
else
if [[ "$PW_USE_TERMINAL" == 1 ]] \
&& [[ "$PW_USE_RUNTIME" == 1 ]]
then
export PW_ADD_TO_ARGS_IN_RUNTIME="--xterm"
pw_init_runtime
fi
echo ""
echo "Log WINE:" > "${PW_LOG_TO_FILE}"
print_info "Log from RUNTIME and WINE:"
${PW_RUN_GAMESCOPE} \
${pw_runtime} \
env PATH="${PATH}" \
LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \
LD_PRELOAD="${PW_LD_PRELOAD}" \
VK_LAYER_PATH="${PW_VK_LAYER_PATH}" \
VK_INSTANCE_LAYERS="${PW_VK_INSTANCE_LAYERS}" \
${PW_GAMEMODERUN_SLR} \
${PW_MANGOHUD_SLR} \
"${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} &>>"${PW_LOG_TO_FILE}"
cat "${PW_LOG_TO_FILE}"
fi fi
echo "WINEDLLOVERRIDES=${WINEDLLOVERRIDES}" >> "${PW_LOG_TO_FILE}"
echo "------------------------------------" >> "${PW_LOG_TO_FILE}"
echo "Log WINE:" >> "${PW_LOG_TO_FILE}"
echo ""
print_info "Log from RUNTIME and WINE:"
${PW_RUN_GAMESCOPE} \
${pw_runtime} \
env PATH="${PATH}" \
LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \
LD_PRELOAD="${PW_LD_PRELOAD}" \
VK_LAYER_PATH="${PW_VK_LAYER_PATH}" \
VK_INSTANCE_LAYERS=${PW_VK_INSTANCE_LAYERS} \
${PW_GAMEMODERUN_SLR} \
${PW_MANGOHUD_SLR} \
"${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} &>>"${PW_LOG_TO_FILE}"
else else
if [[ "${PW_USE_TERMINAL}" == "1" ]] ; then if [[ "${PW_LOG}" == 1 ]] ; then
export PW_ADD_TO_ARGS_IN_RUNTIME="--xterm" if check_start_from_steam ; then
pw_init_runtime for VAR_LOGGER in PW_WINE_USE WINEDIR WINEDLLPATH WINEPREFIX PATH_TO_GAME PW_VULKAN_USE PW_LD_LIBRARY_PATH LD_LIBRARY_PATH PATH \
VKD3D_CONFIG WINEESYNC WINEFSYNC WINEFSYNC_FUTEX2 WINE_CPU_TOPOLOGY DESKTOP_SESSION
do
echo "${VAR_LOGGER}=${!VAR_LOGGER}" >> "${PW_LOG_TO_FILE}"
done
fi
echo "WINEDLLOVERRIDES=${WINEDLLOVERRIDES}" >> "${PW_LOG_TO_FILE}"
echo "------------------------------------" >> "${PW_LOG_TO_FILE}"
echo "Log WINE:" >> "${PW_LOG_TO_FILE}"
echo ""
print_info "Log WINE:"
env \
${PW_GAMEMODERUN_SLR} \
${PW_MANGOHUD_SLR} \
"${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} &>>"${PW_LOG_TO_FILE}"
wait_wineserver
else
echo ""
echo "Log WINE:" > "${PW_LOG_TO_FILE}"
print_info "Log WINE:"
env \
${PW_GAMEMODERUN_SLR} \
${PW_MANGOHUD_SLR} \
"${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]}
wait_wineserver
# ${PW_RUN_GAMESCOPE} \ !!!
fi fi
echo ""
echo "Log WINE:" > "${PW_LOG_TO_FILE}"
print_info "Log from RUNTIME and WINE:"
${PW_RUN_GAMESCOPE} \
${pw_runtime} \
env PATH="${PATH}" \
LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \
LD_PRELOAD="${PW_LD_PRELOAD}" \
VK_LAYER_PATH="${PW_VK_LAYER_PATH}" \
VK_INSTANCE_LAYERS="${PW_VK_INSTANCE_LAYERS}" \
${PW_GAMEMODERUN_SLR} \
${PW_MANGOHUD_SLR} \
"${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} &>>"${PW_LOG_TO_FILE}"
cat "${PW_LOG_TO_FILE}"
fi fi
} }
export -f pw_run export -f pw_run
...@@ -824,6 +865,17 @@ check_user_conf ...@@ -824,6 +865,17 @@ check_user_conf
check_variables PW_LOG "0" check_variables PW_LOG "0"
if [[ -z "${INSTALLING_PORT}" ]] ; then if [[ -z "${INSTALLING_PORT}" ]] ; then
if [[ -f "$HOME/.config/.portproton.lock" ]] ; then
yad_info "$loc_gui_portproton_lock"
exit 0
fi
touch "$HOME/.config/.portproton.lock"
rm_lock_file () {
echo "Removing the lock file..."
rm "$HOME/.config/.portproton.lock" && echo "OK"
}
trap "rm_lock_file" EXIT
. "${USER_CONF}" . "${USER_CONF}"
if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] ; then if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] ; then
pw_port_update pw_port_update
......
data_from_portwine/scripts/start.sh
View file @ 1280cb9a
#!/usr/bin/env bash #!/usr/bin/env bash
# Author: linux-gaming.ru # Author: linux-gaming.ru
export PW_START_PID="$$"
export NO_AT_BRIDGE=1 export NO_AT_BRIDGE=1
export pw_full_command_line=("$0" $*) export pw_full_command_line=("$0" $*)
export YAD_BORDERS=5 export YAD_BORDERS=5
...@@ -62,7 +63,7 @@ if [[ ! -z $(basename "${portwine_exe}" | grep .ppack) ]] ; then ...@@ -62,7 +63,7 @@ if [[ ! -z $(basename "${portwine_exe}" | grep .ppack) ]] ; then
unset PW_SANDBOX_HOME_PATH unset PW_SANDBOX_HOME_PATH
pw_init_runtime pw_init_runtime
export PW_PREFIX_NAME=$(basename "$1" | awk -F'.' '{print $1}') export PW_PREFIX_NAME=$(basename "$1" | awk -F'.' '{print $1}')
${pw_runtime} env PATH="${PATH}" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" unsquashfs -f -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}" "$1" & ${pw_runtime} "${PW_PLUGINS_PATH}/portable/bin/xterm" -e env PATH="${PATH}" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" unsquashfs -f -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}" "$1" &
sleep 10 sleep 10
while true ; do while true ; do
if [[ ! -z $(pgrep -a xterm | grep ".ppack" | head -n 1 | awk '{print $1}') ]] ; then if [[ ! -z $(pgrep -a xterm | grep ".ppack" | head -n 1 | awk '{print $1}') ]] ; then
...@@ -378,10 +379,8 @@ pw_prefix_manager () { ...@@ -378,10 +379,8 @@ pw_prefix_manager () {
try_remove_file "${PORT_WINE_TMP_PATH}/to_winetricks" try_remove_file "${PORT_WINE_TMP_PATH}/to_winetricks"
if [[ ! -z ${SET_FROM_PFX_MANAGER} ]] ; then if [[ ! -z ${SET_FROM_PFX_MANAGER} ]] ; then
export PW_ADD_TO_ARGS_IN_RUNTIME="--xterm" ${pw_runtime} "${PW_PLUGINS_PATH}/portable/bin/xterm" -e env PATH="${PATH}" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" GST_PLUGIN_SYSTEM_PATH_1_0="" \
pw_init_runtime "${PORT_WINE_TMP_PATH}/winetricks" -q -r -f ${SET_FROM_PFX_MANAGER}
${pw_runtime} env PATH="${PATH}" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" GST_PLUGIN_SYSTEM_PATH_1_0="" \
"${PORT_WINE_TMP_PATH}/winetricks" -q -r -f ${SET_FROM_PFX_MANAGER} &>>"${PORT_WINE_TMP_PATH}/update_pfx_log"
gui_prefix_manager gui_prefix_manager
else else
print_info "Nothing to do. Restarting PortProton..." print_info "Nothing to do. Restarting PortProton..."
...@@ -423,7 +422,6 @@ pw_winetricks () { ...@@ -423,7 +422,6 @@ pw_winetricks () {
pw_start_cont_xterm () { pw_start_cont_xterm () {
cd "$HOME" cd "$HOME"
unset PW_SANDBOX_HOME_PATH unset PW_SANDBOX_HOME_PATH
# export PW_ADD_TO_ARGS_IN_RUNTIME="--xterm"
pw_init_runtime pw_init_runtime
${pw_runtime} \ ${pw_runtime} \
env PATH="${PATH}" \ env PATH="${PATH}" \
...@@ -467,13 +465,13 @@ pw_create_prefix_backup () { ...@@ -467,13 +465,13 @@ pw_create_prefix_backup () {
done done
if [[ -f "${PW_PREFIX_TO_BACKUP}/${PW_PREFIX_NAME}.ppack.part" ]] ; then if [[ -f "${PW_PREFIX_TO_BACKUP}/${PW_PREFIX_NAME}.ppack.part" ]] ; then
mv -f "${PW_PREFIX_TO_BACKUP}/${PW_PREFIX_NAME}.ppack.part" "${PW_PREFIX_TO_BACKUP}/${PW_PREFIX_NAME}.ppack" mv -f "${PW_PREFIX_TO_BACKUP}/${PW_PREFIX_NAME}.ppack.part" "${PW_PREFIX_TO_BACKUP}/${PW_PREFIX_NAME}.ppack"
yad_info "$PW_PFX_BACKUP_SUCCESS" yad_info "$PW_PFX_BACKUP_SUCCESS $PW_PREFIX_NAME"
if [[ ! -f "${PORT_WINE_TMP_PATH}/pfx_backup_info" ]] ; then if [[ ! -f "${PORT_WINE_TMP_PATH}/pfx_backup_info" ]] ; then
yad_info "$PW_PFX_BACKUP_INFO" yad_info "$PW_PFX_BACKUP_INFO"
echo "1" > "${PORT_WINE_TMP_PATH}/pfx_backup_info" echo "1" > "${PORT_WINE_TMP_PATH}/pfx_backup_info"
fi fi
else else
yad_error "$PW_PFX_BACKUP_ERROR" yad_error "$PW_PFX_BACKUP_ERROR $PW_PREFIX_NAME"
fi fi
return 0 return 0
...@@ -483,17 +481,17 @@ pw_edit_db () { ...@@ -483,17 +481,17 @@ pw_edit_db () {
if [[ "${XDG_SESSION_TYPE}" == "wayland" ]] ; then if [[ "${XDG_SESSION_TYPE}" == "wayland" ]] ; then
pw_gui_for_edit_db \ pw_gui_for_edit_db \
PW_MANGOHUD PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_VKBASALT_USER_CONF PW_NO_ESYNC PW_NO_FSYNC PW_USE_RAY_TRACING \ PW_MANGOHUD PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_VKBASALT_USER_CONF PW_NO_ESYNC PW_NO_FSYNC PW_USE_RAY_TRACING \
PW_USE_NVAPI_AND_DLSS PW_USE_FAKE_DLSS PW_USE_FAKE_DLSS_3 PW_WINE_FULLSCREEN_FSR PW_HIDE_NVIDIA_GPU PW_VIRTUAL_DESKTOP PW_USE_TERMINAL \ PW_USE_NVAPI_AND_DLSS PW_USE_FAKE_DLSS PW_USE_FAKE_DLSS_3 PW_WINE_FULLSCREEN_FSR PW_HIDE_NVIDIA_GPU PW_VIRTUAL_DESKTOP \
PW_GUI_DISABLED_CS PW_USE_GAMEMODE PW_USE_D3D_EXTRAS PW_FIX_VIDEO_IN_GAME PW_REDUCE_PULSE_LATENCY \ PW_USE_TERMINAL PW_GUI_DISABLED_CS PW_USE_GAMEMODE PW_USE_D3D_EXTRAS PW_FIX_VIDEO_IN_GAME PW_REDUCE_PULSE_LATENCY \
PW_USE_GSTREAMER PW_FORCE_LARGE_ADDRESS_AWARE PW_USE_SHADER_CACHE \ PW_USE_GSTREAMER PW_FORCE_LARGE_ADDRESS_AWARE PW_USE_SHADER_CACHE PW_USE_WINE_DXGI PW_USE_EAC_AND_BE PW_USE_SYSTEM_VK_LAYERS \
PW_USE_WINE_DXGI PW_USE_EAC_AND_BE PW_USE_SYSTEM_VK_LAYERS PW_USE_OBS_VKCAPTURE PW_USE_GALLIUM_ZINK PW_USE_GAMESCOPE PW_DISABLE_COMPOSITING PW_USE_OBS_VKCAPTURE PW_USE_GALLIUM_ZINK PW_USE_GAMESCOPE PW_DISABLE_COMPOSITING PW_USE_RUNTIME
else else
pw_gui_for_edit_db \ pw_gui_for_edit_db \
PW_MANGOHUD PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_VKBASALT_USER_CONF PW_NO_ESYNC PW_NO_FSYNC PW_USE_RAY_TRACING \ PW_MANGOHUD PW_MANGOHUD_USER_CONF ENABLE_VKBASALT PW_VKBASALT_USER_CONF PW_NO_ESYNC PW_NO_FSYNC PW_USE_RAY_TRACING \
PW_USE_NVAPI_AND_DLSS PW_USE_FAKE_DLSS PW_USE_FAKE_DLSS_3 PW_WINE_FULLSCREEN_FSR PW_HIDE_NVIDIA_GPU PW_VIRTUAL_DESKTOP PW_USE_TERMINAL \ PW_USE_NVAPI_AND_DLSS PW_USE_FAKE_DLSS PW_USE_FAKE_DLSS_3 PW_WINE_FULLSCREEN_FSR PW_HIDE_NVIDIA_GPU PW_VIRTUAL_DESKTOP \
PW_GUI_DISABLED_CS PW_USE_GAMEMODE PW_USE_D3D_EXTRAS PW_FIX_VIDEO_IN_GAME \ PW_USE_TERMINAL PW_GUI_DISABLED_CS PW_USE_GAMEMODE PW_USE_D3D_EXTRAS PW_FIX_VIDEO_IN_GAME PW_REDUCE_PULSE_LATENCY\
PW_REDUCE_PULSE_LATENCY PW_USE_US_LAYOUT PW_USE_GSTREAMER PW_FORCE_LARGE_ADDRESS_AWARE PW_USE_SHADER_CACHE \ PW_USE_US_LAYOUT PW_USE_GSTREAMER PW_FORCE_LARGE_ADDRESS_AWARE PW_USE_SHADER_CACHE PW_USE_WINE_DXGI PW_USE_EAC_AND_BE \
PW_USE_WINE_DXGI PW_USE_EAC_AND_BE PW_USE_SYSTEM_VK_LAYERS PW_USE_OBS_VKCAPTURE PW_USE_GALLIUM_ZINK PW_USE_GAMESCOPE PW_DISABLE_COMPOSITING PW_USE_SYSTEM_VK_LAYERS PW_USE_OBS_VKCAPTURE PW_USE_GALLIUM_ZINK PW_USE_GAMESCOPE PW_DISABLE_COMPOSITING PW_USE_RUNTIME
fi fi
if [[ "$?" == 0 ]] ; then if [[ "$?" == 0 ]] ; then
print_info "Restarting PP after update ppdb file..." print_info "Restarting PP after update ppdb file..."
...@@ -535,7 +533,7 @@ case "${1}" in ...@@ -535,7 +533,7 @@ case "${1}" in
'--help' ) '--help' )
files_from_autoinstall=$(ls "${PORT_SCRIPTS_PATH}/pw_autoinstall") files_from_autoinstall=$(ls "${PORT_SCRIPTS_PATH}/pw_autoinstall")
echo -e " echo -e "
usege: [--reinstall] [--autoinstall] use: [--reinstall] [--autoinstall]
--reinstall reinstall files of the portproton to default settings --reinstall reinstall files of the portproton to default settings
--autoinstall [script_frome_pw_autoinstall] autoinstall from the list below: --autoinstall [script_frome_pw_autoinstall] autoinstall from the list below:
...@@ -573,7 +571,10 @@ IFS=$IFS_OLD ...@@ -573,7 +571,10 @@ IFS=$IFS_OLD
export PW_ADD_PREFIXES_TO_GUI="${PW_PREFIX_NAME^^}${PW_ADD_PREFIXES_TO_GUI}" export PW_ADD_PREFIXES_TO_GUI="${PW_PREFIX_NAME^^}${PW_ADD_PREFIXES_TO_GUI}"
PW_ALL_DIST=$(ls "${PORT_WINE_PATH}/data/dist/" | sed -e s/"${PW_WINE_LG_VER}$//g" | sed -e s/"${PW_PROTON_LG_VER}$//g") PW_ALL_DIST=$(ls "${PORT_WINE_PATH}/data/dist/" | sed -e s/"${PW_WINE_LG_VER}$//g" | sed -e s/"${PW_PROTON_LG_VER}$//g")
unset DIST_ADD_TO_GUI if command -v wine &>/dev/null
then DIST_ADD_TO_GUI="!USE_SYSTEM_WINE"
else unset DIST_ADD_TO_GUI
fi
for DAIG in ${PW_ALL_DIST} for DAIG in ${PW_ALL_DIST}
do do
export DIST_ADD_TO_GUI="${DIST_ADD_TO_GUI}!${DAIG}" export DIST_ADD_TO_GUI="${DIST_ADD_TO_GUI}!${DAIG}"
......
data_from_portwine/scripts/var
View file @ 1280cb9a
#!/usr/bin/env bash #!/usr/bin/env bash
#Author: Castro-Fidel (linux-gaming.ru) #Author: Castro-Fidel (linux-gaming.ru)
#SCRIPTS_NEXT_VERSION=2261 #SCRIPTS_NEXT_VERSION=2262
######################################################################## ########################################################################
export PW_MANGOHUD="0" 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" 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"
...@@ -8,6 +8,7 @@ export PW_VKBASALT_EFFECTS="Curves:cas" ...@@ -8,6 +8,7 @@ export PW_VKBASALT_EFFECTS="Curves:cas"
export PW_VKBASALT_FFX_CAS="0.66" export PW_VKBASALT_FFX_CAS="0.66"
export ENABLE_VKBASALT=1 export ENABLE_VKBASALT=1
export GAMESCOPE_ARGS="-F fsr" export GAMESCOPE_ARGS="-F fsr"
export PW_USE_RUNTIME="1"
export PW_RT_MOUNT_RO=("") export PW_RT_MOUNT_RO=("")
export PW_RT_MOUNT_RW=("/media" "/mnt" "/run/media/${USER}" "${PORT_WINE_PATH}") export PW_RT_MOUNT_RW=("/media" "/mnt" "/run/media/${USER}" "${PORT_WINE_PATH}")
#export PW_SANDBOX_HOME_PATH="${PORT_WINE_PATH}" #export PW_SANDBOX_HOME_PATH="${PORT_WINE_PATH}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment