diff --git a/sha256sum.list b/sha256sum.list index b358a78..82cdb58 100755 --- a/sha256sum.list +++ b/sha256sum.list @@ -19,6 +19,9 @@ df1a940d2e072a884524f66a16e0f0ef74048bc6a6642b96eb257528a522109f vkd3d-proton-1 ##### CPCSP_PROXY ##### 3153088ff28d6af415c3504a421e5382554dbb305f38d5a87dd84df90d680421 wine-cpcsp_proxy-0.6.1-alt1.tar.xz +##### FONTS ##### +405bfe3b7c7f80034837c05656535053305727ee4bf1d993521b67b71d08ebc6 extra_fonts_v01.tar.xz + ##### PREFIX ##### 0e86cd9958d1bd1bfac99e23165a091a4ea2fa3e693c551f69aabeed5f681fea defpfx_x86_v01.tar.xz diff --git a/winehelper b/winehelper index d648b5f..ee04152 100755 --- a/winehelper +++ b/winehelper @@ -102,6 +102,9 @@ check_variables WH_WINE_USE "wine_x_tkg_10-0_amd64" # or system check_variables WH_USE_CPCSP_PROXY "0" check_variables CPCSP_PROXY_VER "0.6.1-alt1" +check_variables WH_USE_EXTRA_FONTS "0" +check_variables EXTRA_FONTS_VER "01" + check_variables STAGING_SHARED_MEMORY "1" check_variables WINE_LARGE_ADDRESS_AWARE "1" check_variables WINE_FULLSCREEN_FSR "1" @@ -1070,6 +1073,23 @@ init_wineprefix () { fi fi + # Устанавливаем дополнительные шрифты (включая штрих-код) + local fonts_dir="$DRIVE_C/windows/Fonts" + local x_fonts_name="extra_fonts_v${EXTRA_FONTS_VER}" + + if [[ $WH_USE_EXTRA_FONTS == "1" ]] \ + && [[ ! -e "$fonts_dir/${x_fonts_name}.installed" ]] + then + print_info "Устанавливаем дополнительные шрифты..." + local x_fonts_url="$CLOUD_URL/${x_fonts_name}.tar.xz" + local x_fonts_tar="$WH_TMP_DIR/${x_fonts_name}.tar.xz" + if [[ ! -f "$x_fonts_tar" ]] ; then + try_download "$x_fonts_url" "$x_fonts_tar" check256sum + fi + unpack "$x_fonts_tar" "$fonts_dir/" + touch "$fonts_dir/${x_fonts_name}.installed" + fi + echo "# переменные последнего использования префикса:" > "$WINEPREFIX/last.conf" for var in WH_WINE_USE BASE_PFX WINEARCH WH_WINDOWS_VER WINEESYNC WINEFSYNC \ STAGING_SHARED_MEMORY WINE_LARGE_ADDRESS_AWARE WH_USE_SHADER_CACHE WH_USE_WINE_DXGI \