From 72e773cfa0cf509196a7c29dfb73ffe0685b2a01 Mon Sep 17 00:00:00 2001 From: castro-fidel Date: Fri, 27 May 2022 00:41:45 +0300 Subject: [PATCH] Scripts version 2108 --- data_from_portwine/changelog_eng | 3 +++ data_from_portwine/changelog_rus | 3 +++ data_from_portwine/scripts/functions_helper | 2 -- data_from_portwine/scripts/runlib | 4 ++-- data_from_portwine/scripts/var | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 9de8a85..ff22061 100644 --- 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: boosty.to/port ----------------------------------------- Changelog: +###Scripts version 2108### +* HOTFIX for Rosa Linux + ###Scripts version 2107### * accelerated container launch * optimization of start.sh script diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 4c76c52..cd5d621 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,9 @@ ----------------------------------------- История изменений: +###Scripts version 2108### +* HOTFIX - для правильной работы в Rosa Linux + ###Scripts version 2107### * ускорен запуск контейнера * оптимизация скрипта start.sh diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 62f4685..c8a9060 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -369,7 +369,6 @@ pw_init_runtime () { --no-gc-runtimes \ --copy-runtime \ --remove-game-overlay \ - --no-generate-locales \ ${PW_ADD_TO_ARGS_IN_RUNTIME} --" else export pw_runtime="${PW_WINELIB}/pressure-vessel/bin/pressure-vessel-unruntime \ @@ -377,7 +376,6 @@ pw_init_runtime () { --no-gc-legacy-runtimes \ --no-gc-runtimes \ --copy-runtime \ - --no-generate-locales \ --remove-game-overlay \ ${PW_ADD_TO_ARGS_IN_RUNTIME} --" fi diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 808d1c6..c10a6f8 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -251,12 +251,12 @@ start_portwine () { if [[ -d "${PW_PLUGINS_PATH}/default_pfx/" ]] ; then cp -frL "${PW_PLUGINS_PATH}/default_pfx/"* "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/" fi - ${pw_runtime} env LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" "${WINELOADER}" wineboot -i &>>"${PORT_WINE_TMP_PATH}/update_pfx_log" + ${pw_runtime} env LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" "${WINELOADER}" wineboot -u &>>"${PORT_WINE_TMP_PATH}/update_pfx_log" wait_wineserver && echo "${PW_WINE_USE}" > "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver" elif [[ -z "`cat "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver" | grep ${PW_WINE_USE}`" ]] ; then check_dirs_and_files_in_pfx - ${pw_runtime} env LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" "${WINELOADER}" wineboot -i &>>"${PORT_WINE_TMP_PATH}/update_pfx_log" + ${pw_runtime} env LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" "${WINELOADER}" wineboot -u &>>"${PORT_WINE_TMP_PATH}/update_pfx_log" wait_wineserver && echo "${PW_WINE_USE}" > "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver" fi diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 6ad66b0..3d5afa2 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (PortWINE-Linux.ru) -#SCRIPTS_NEXT_VERSION=2107 +#SCRIPTS_NEXT_VERSION=2108 ######################################################################## export PW_MANGOHUD=0 export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt