diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 86fd59c..9ce113b 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: boosty.to/linu ----------------------------------------- Changelog: +###Scripts version 2204### Date: 29.06.2023 / Update download size: 9 megabytes. +* update localization +* minor fixes for installing LGC and WGC + ###Scripts version 2203### Date: 23.06.2023 / Update download size: 9 megabytes. * minor fixes for installing Battle.net diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index b558185..ac4c66a 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -1,6 +1,11 @@ Вы можете помочь развитию проекта: https://linux-gaming.ru/donate/ ----------------------------------------- История изменений: + +###Scripts version 2204### Дата: 29.06.2023 / Размер скачиваемого обновления: 9 мегабайт. +* улучшение локализации (спасибо Boria138) +* обновлены автоустановки LGC и WGC + ###Scripts version 2203### Дата: 23.06.2023 / Размер скачиваемого обновления: 9 мегабайт. * дополнены всплывающие подсказки в меню настроек vkBasalt (спасибо Boria138) * обновлен установщик Battle.net diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index cecaae8..e1f741c 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -1,5 +1,6 @@ #!/usr/bin/env bash # Author: linux-gaming.ru +# Helped in translation: ConTI1NuEsZZZ and Boria138 unset update_loc if [[ -f "${PORT_WINE_TMP_PATH}/${portname}_loc" ]] ; then @@ -19,8 +20,7 @@ else fi fi -if [ "${update_loc}" = "RUS" ] -then +if [ "${update_loc}" = "RUS" ] ; then export loc_gui_pw_reinstall_pp="Переустановить ${portname}" export loc_gui_rm_pp="Удалить ${portname}" export loc_gui_upd_pp="Проверить обновления" @@ -264,10 +264,8 @@ then export loc_gui_installing_the="Устанавливаем" export loc_gui_please_wait="Пожалуйста подождите..." -elif [ "${update_loc}" = "ENG" ] -then - # Helped in translation: ConTI1NuEsZZZ and Boria138 - +elif [ "${update_loc}" = "ENG" ] ; then + export loc_gui_pw_reinstall_pp="REINSTALL ${portname}" export loc_gui_rm_pp="REMOVE ${portname}" export loc_gui_upd_pp="UPDATE ${portname}" @@ -512,5 +510,3 @@ A brief instruction: export loc_gui_installing_the="Installing the" export loc_gui_please_wait="Please wait..." fi - - diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_LGC b/data_from_portwine/scripts/pw_autoinstall/PW_LGC index ea8ee62..535125b 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_LGC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_LGC @@ -13,26 +13,18 @@ try_download_lgc () { } start_portwine -if [[ -f "$WINEPREFIX/drive_c/ProgramData/Lesta/GameCenter/api/lgc_api.exe" ]] ; then - if [[ ! -f "$WINEPREFIX/drive_c/ProgramData/Wargaming.net/GameCenter/api/wgc_api.exe" ]] ; then - try_remove_file "${HOME}/.local/share/applications/Wargaming Game Center.desktop" - try_remove_file "${PORT_WINE_PATH}/Wargaming Game Center.desktop" - fi - export PORTWINE_CREATE_SHORTCUT_NAME="Lesta Game Center" + +if try_download_lgc "redirect.lesta.ru/LGC/Lesta_Game_Center_Install_RU.exe" "${PW_AUTOINSTALL_EXE}" +then + pw_start_progress_bar_block "Starting LGC installation..." + pw_kill_autostart lgc.exe & + pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/ProgramData/Lesta/GameCenter/api/lgc_api.exe" - portwine_create_shortcut -else - if try_download_lgc "redirect.lesta.ru/LGC/Lesta_Game_Center_Install_RU.exe" "${PW_AUTOINSTALL_EXE}" - then - pw_start_progress_bar_block "Starting LGC installation..." - pw_kill_autostart lgc.exe & - pw_run "${PW_AUTOINSTALL_EXE}" - portwine_exe="$WINEPREFIX/drive_c/ProgramData/Lesta/GameCenter/api/lgc_api.exe" - export PORTWINE_CREATE_SHORTCUT_NAME="Lesta Game Center" - try_remove_file "${PW_AUTOINSTALL_EXE}" + export PORTWINE_CREATE_SHORTCUT_NAME="Lesta Game Center" + try_remove_file "${PW_AUTOINSTALL_EXE}" try_remove_file "${portwine_exe}.ppdb" - kill_portwine - portwine_create_shortcut - fi + kill_portwine + portwine_create_shortcut fi + stop_portwine diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index b2f10c4..c4acd22 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -456,13 +456,6 @@ export -f gui_credits ###MAIN### -# HOTFIX WGC TO LGC -if [[ ! -z "$(echo ${1} | grep 'wgc_api.exe')" ]] && [[ ! -f "${1}" ]] ; then - export PW_YAD_SET=PW_LGC - pw_autoinstall_from_db - exit 0 -fi - # HOTFIX CALIBRE if [[ ! -z "$(echo ${1} | grep '/Caliber/')" ]] ; then export PW_WINE_USE=PROTON_STEAM_6.3-8 diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index d45552f..4ff8f0c 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2203 +#SCRIPTS_NEXT_VERSION=2204 ######################################################################## 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 @@ -24,6 +24,7 @@ export PW_PREFIX_NAME="DEFAULT" export WINE_WIN_START="start /i /b /wait /high /unix" export PW_USE_SHADER_CACHE="1" export STAGING_SHARED_MEMORY="1" +export PROTON_DISABLE_LSTEAMCLIENT="1" export PW_FORCE_LARGE_ADDRESS_AWARE="1" export PW_MANGOHUD_x32="0" export PW_USE_EAC_AND_BE="1"