diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index a53d069..f14e8c0 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,10 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2244### Date: 14.01.2024 / Download update size: 8 megabytes +* updated PROTON_LG to version 8-25-2 (added fonts from proton steam) +* fixed the display of the script version after reinstalling PortProton from the settings of the PortProton itself + ###Scripts version 2243### Date: 12.01.2024 / Download update size: 8 megabytes * HOTFIX: Fixed spontaneous prefix switching when using the MANGOHUD configuration interface diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 3d461b5..e19eb5f 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,10 @@ ----------------------------------------- История изменений: +###Scripts version 2244### Дата: 14.01.2024 / Размер скачиваемого обновления: 8 мегабайт +* обновлен PROTON_LG до версии 8-25-2 (добавлены шрифты из proton steam) +* исправлено отображение версии скриптов после переустановки PortProton из настроек самого PortProton + ###Scripts version 2243### Дата: 12.01.2024 / Размер скачиваемого обновления: 8 мегабайт * HOTFIX: Исправлено самопроизводное переключение префикса при использовании интерфейса настройки MANGOHUD diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 07c29f8..557c9cd 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -312,10 +312,11 @@ pw_reinstall_pp () { fi pw_clear_pfx try_remove_dir "${PORT_WINE_PATH}/data/dist" + create_new_dir "${PORT_WINE_PATH}/data/dist" try_remove_dir "${PORT_WINE_TMP_PATH}/VULKAN" try_remove_file "${PORT_WINE_TMP_PATH}/scripts_update_notifier" try_remove_file "${PORT_WINE_PATH}/data/user.conf" - echo 1000 > "${PORT_WINE_TMP_PATH}/scripts_ver" + try_remove_file "${PORT_WINE_TMP_PATH}/scripts_ver" echo print_info "Restarting PP for reinstall files..." /usr/bin/env bash -c ${pw_full_command_line[*]} & diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 5564efc..33d3526 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -279,24 +279,14 @@ start_portwine () { [ ! -d "${WINEPREFIX}/dosdevices/c:" ] && try_force_link_dir "${WINEPREFIX}/drive_c/" "${WINEPREFIX}/dosdevices/c:" [ ! -d "${WINEPREFIX}/dosdevices/z:" ] && try_force_link_dir "/" "${WINEPREFIX}/dosdevices/z:" [ ! -d "${WINEPREFIX}/dosdevices/h:" ] && try_force_link_dir "$HOME" "${WINEPREFIX}/dosdevices/h:" - create_new_dir "${WINEPREFIX}/drive_c/windows/Fonts/" - try_force_link_file "${WINEDIR}/share/fonts/"LiberationSans-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"arial.ttf - try_force_link_file "${WINEDIR}/share/fonts/"LiberationSans-Bold.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"arialbd.ttf - try_force_link_file "${WINEDIR}/share/fonts/"LiberationSerif-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"times.ttf - try_force_link_file "${WINEDIR}/share/fonts/"LiberationMono-Regular.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"cour.ttf - try_force_link_file "${WINEDIR}/share/fonts/"LiberationMono-Bold.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"courbd.ttf - try_force_link_file "${WINEDIR}/share/fonts/"msyh.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"msyh.ttf - try_force_link_file "${WINEDIR}/share/fonts/"malgun.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"malgun.ttf - try_force_link_file "${WINEDIR}/share/fonts/"micross.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"micross.ttf - try_force_link_file "${WINEDIR}/share/fonts/"nirmala.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"nirmala.ttf - - try_force_link_file "${WINEDIR}/share/fonts/"simsun.ttc "${WINEPREFIX}/drive_c/windows/Fonts/"simsun.ttc - try_force_link_file "${WINEDIR}/share/fonts/"msgothic.ttc "${WINEPREFIX}/drive_c/windows/Fonts/"msgothic.ttc - try_force_link_file "${WINEDIR}/share/wine/fonts/"tahoma.ttf "${WINEPREFIX}/drive_c/windows/Fonts/"tahoma.ttf + create_new_dir "${WINEPREFIX}/drive_c/windows/Fonts/" + LN_FONTS="arialbd.ttf courbd.ttf georgia.ttf micross.ttf msyh.ttf simsun.ttc arial.ttf cour.ttf malgun.ttf msgothic.ttc nirmala.ttf times.ttf" + for link_font in $LN_FONTS ; do + try_force_link_file "${WINEDIR}/share/fonts/${link_font}" "${WINEPREFIX}/drive_c/windows/Fonts/${link_font}" + done find "${WINEPREFIX}/dosdevices" -xtype l -maxdepth 1 2>/dev/null -exec rm {} \; - rm -f "${WINEPREFIX}/dosdevices/"*:: DRIVES=(d e f g i j k l m n o p q r s t u v w x y) DEF_MOUNT_DIRS=('/media' "/media/$USER" '/mnt' '/run/media' "/run/media/$USER") diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 31676de..c17eece 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,10 +1,9 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2243 +#SCRIPTS_NEXT_VERSION=2244 ######################################################################## export PW_MANGOHUD=0 export DEFAULT_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,gamemode -#export PW_XKBD_RU_HACK=1 export PW_RT_MOUNT_RO=("") export PW_RT_MOUNT_RW=("/media" "/mnt" "/run/media/${USER}" "${PORT_WINE_PATH}") #export PW_SANDBOX_HOME_PATH="${PORT_WINE_PATH}" @@ -26,7 +25,6 @@ export WINE_ALLOW_XIM="0" export PW_USE_SHADER_CACHE="1" export PW_WINE_CPU_TOPOLOGY="disabled" export STAGING_SHARED_MEMORY="1" -export PROTON_DISABLE_LSTEAMCLIENT="0" export PW_FORCE_LARGE_ADDRESS_AWARE="1" export PW_USE_EAC_AND_BE="1" export PW_USE_US_LAYOUT="0" @@ -40,11 +38,11 @@ export PW_WINE_USE="PROTON_LG" export PW_PLUGINS_VER="_v12" export PW_FAKE_DLSS_VER="230506" ###WINE_AND_PROTON_LG### -export PW_PROTON_LG_VER="PROTON_LG_8-25-1" +export PW_PROTON_LG_VER="PROTON_LG_8-25-2" export PW_WINE_LG_VER="WINE_LG_8-18-1" export PW_WINE_FULLSCREEN_FSR="1" ###DXVK_AND_VKD3D### -export VKD3D_LIMIT_TESS_FACTORS="32" +export VKD3D_LIMIT_TESS_FACTORS="64" export D8VK_VER="1.0" export DXVK_STABLE_VER="1.10.3-28" export DXVK_GIT_VER="2.3-26" @@ -54,32 +52,22 @@ export VKD3D_GIT_VER="1.1-3821" export DOTPFX_VER="48v2" export DEFPFX_VER="v1" export PROGPFX_VER="v1" -export PW_MUST_WINEDLLOVERRIDES="steam_api,steam_api64,steamclient,steamclient64=n;dotnetfx35.exe,dotnetfx35setup.exe=b,winemenubuilder.exe=" +export PW_MUST_WINEDLLOVERRIDES="steam_api,steam_api64,steamclient,steamclient64=n;dotnetfx35.exe,dotnetfx35setup.exe=b;winemenubuilder.exe=" ################################################################# export DXVK_CONFIG_FILE="${PORT_WINE_PATH}/data/dxvk.conf" ################################################################# pw_install_dll_in_prefix () { case $PW_PREFIX_NAME in - DEFAULT) export PW_MUST_HAVE_DLL="d3dx9 d3dcompiler_43 physx mfc42 vcrun2022 sandbox" ;; - DOTNET) export PW_MUST_HAVE_DLL="physx mfc42 vcrun2019 faudio dotnet48" ;; - PROGRAMS) export PW_MUST_HAVE_DLL="d3dx9 d3dcompiler_43 physx mfc42 vcrun2019 riched20 corefonts msxml3 msxml4 msxml6" ;; - *) export PW_MUST_HAVE_DLL="" ;; + DEFAULT) export PW_MUST_HAVE_DLL="d3dx9 d3dcompiler_43 physx mfc42 vcrun2022 sandbox" ;; + DOTNET) export PW_MUST_HAVE_DLL="physx mfc42 vcrun2019 faudio dotnet48" ;; + PROGRAMS) export PW_MUST_HAVE_DLL="d3dx9 d3dcompiler_43 physx mfc42 vcrun2019 riched20 corefonts msxml3 msxml4 msxml6" ;; + *) export PW_MUST_HAVE_DLL="" ;; esac } ######################################################################## -add_in_start_portwine () -{ - echo " " -} +add_in_start_portwine () { echo "" ;} +add_in_stop_portwine () { echo "" ;} +pw_other_fixes () { echo "" ;} +export -f add_in_stop_portwine add_in_stop_portwine pw_other_fixes ######################################################################## -add_in_stop_portwine () -{ - echo " " -} -export -f add_in_stop_portwine -######################################################################## -pw_other_fixes () -{ - echo "" -}