diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index cbae953..ebad901 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/linu ----------------------------------------- Changelog: +###Scripts version 2136### +* added "Lesta Game Center" in AUTOINSTALL + ###Scripts version 2135### * updated PROTON_GE_7-37 (updated dxvk and vkd3d) diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 37a4d4d..7bed360 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,9 @@ ----------------------------------------- История изменений: +###Scripts version 2136### +* добавлен автоустановщик "Lesta Game Center" и автоматическое обновление ярлыков, при условии что LGC уже утановлен, но запущен ярлык для WGC. + ###Scripts version 2135### * обновлен "PROTON_GE" до версии 7-37 (версии dxvk и vkd3d обновлены) diff --git a/data_from_portwine/img/gui/lgc.png b/data_from_portwine/img/gui/lgc.png new file mode 100644 index 0000000..1d7ad0e Binary files /dev/null and b/data_from_portwine/img/gui/lgc.png differ diff --git a/data_from_portwine/scripts/portwine_db/wgc b/data_from_portwine/scripts/portwine_db/wgc index f924567..25c80e1 100755 --- a/data_from_portwine/scripts/portwine_db/wgc +++ b/data_from_portwine/scripts/portwine_db/wgc @@ -2,8 +2,10 @@ #Author: PortWINE #wgc.exe #wgc_api.exe +#lgc_api.exe +#lgc.exe #Rating=5 -export PW_COMMENT_DB="Wargaming Game Center" +export PW_COMMENT_DB="Wargaming and Lesta Game Centers" ################################################ export PW_WINE_USE=PROTON_GE export PW_VULKAN_USE=1 #dxvk, vkd3d or 0 for OpenGL diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_LGC b/data_from_portwine/scripts/pw_autoinstall/PW_LGC new file mode 100644 index 0000000..03fd3f8 --- /dev/null +++ b/data_from_portwine/scripts/pw_autoinstall/PW_LGC @@ -0,0 +1,37 @@ +#!/usr/bin/env bash +# Author: chal55rus +######################################################################## +export LAUNCH_PARAMETERS=("/VERYSILENT") +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Lesta_Game_Center_Install_RU.exe" + +try_download_lgc () { + set -o pipefail + wget -t 5 -T 3 "$1" --output-document="$2" 2>&1 | \ + tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \ + "${pw_yad_new}" --center --progress --percentage=0 --title="Download $(basename $1)" --text=Starting... --auto-close --auto-kill --width=500 --height=90 + [ "${PIPESTATUS[0]}" != 0 ] && print_error "failed to download $1. Scipping." && return 1 || return 0 +} + +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" + 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}" + kill_portwine + portwine_create_shortcut + fi +fi +stop_portwine diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 908efbd..a3f6135 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -649,19 +649,15 @@ fi . "${PORT_SCRIPTS_PATH}"/lang . "${PORT_SCRIPTS_PATH}"/zen_yad_gui -export urlg="https://https://linux-gaming.ru/portproton/" +export urlg="https://linux-gaming.ru/portproton/" export PW_WINELIB="${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}" try_remove_dir "${PW_WINELIB}/var" export PW_GUI_ICON_PATH="${PORT_WINE_PATH}/data/img/gui" export install_ver=`cat "${PORT_WINE_TMP_PATH}/${portname}_ver" | head -n 1` -if [[ "${install_ver}" == 97 ]] ; then - export install_ver="1.0" - echo "1.0" > "${PORT_WINE_TMP_PATH}/${portname}_ver" -fi export WINETRICKS_DOWNLOADER="curl" export USER_CONF="${PORT_WINE_PATH}/data/user.conf" check_user_conf -sed -i 's/ PP_/ PW_/g' "${USER_CONF}" +# sed -i 's/ PP_/ PW_/g' "${USER_CONF}" if [[ ! -d "${HOME}/PortWINE" ]] && [[ -d "${HOME}/.local/share/PortWINE/PortProton/" ]] ; then ln -s "${HOME}/.local/share/PortWINE/" "${HOME}" fi diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 68f3140..f05c45b 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -56,7 +56,7 @@ portwine_launch () { PORTWINE_BAT=$(basename "${portwine_exe}" | grep .bat) if [[ -n "${PW_VIRTUAL_DESKTOP}" && "${PW_VIRTUAL_DESKTOP}" == "1" ]] ; then pw_screen_resolution=$(xrandr --current | grep "*" | awk '{print $1;}' | head -1) - pw_run explorer "/desktop=portwine,${pw_screen_resolution}" ${WINE_WIN_START} "$portwine_exe" + pw_run explorer "/desktop=PortProton,${pw_screen_resolution}" ${WINE_WIN_START} "$portwine_exe" elif [ -n "${PORTWINE_MSI}" ]; then pw_run msiexec /i "$portwine_exe" elif [[ -n "${PORTWINE_BAT}" || -n "${portwine_exe}" ]] ; then @@ -440,6 +440,14 @@ gui_credits () { 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 + PW_PREFIX_NAME="$(echo "${PW_PREFIX_NAME}" | sed -e s/[[:blank:]]/_/g)" PW_ALL_PREFIXES=$(ls "${PORT_WINE_PATH}/data/prefixes/" | sed -e s/"${PW_PREFIX_NAME}$"//g) export PW_PREFIX_NAME PW_ALL_PREFIXES @@ -650,6 +658,7 @@ else --field=" GoG Galaxy Launcher"!"$PW_GUI_ICON_PATH/gog.png"!"":"FBTN" '@bash -c "button_click PW_GOG"' \ --field=" Ubisoft Game Launcher"!"$PW_GUI_ICON_PATH/ubc.png"!"":"FBTN" '@bash -c "button_click PW_UBC"' \ --field=" EVE Online Launcher"!"$PW_GUI_ICON_PATH/eve.png"!"":"FBTN" '@bash -c "button_click PW_EVE"' \ + --field=" Lesta Game Center"!"$PW_GUI_ICON_PATH/lgc.png"!"":"FBTN" '@bash -c "button_click PW_LGC"' \ --field=" Origin Launcher"!"$PW_GUI_ICON_PATH/origin.png"!"":"FBTN" '@bash -c "button_click PW_ORIGIN"' \ --field=" Rockstar Games Launcher"!"$PW_GUI_ICON_PATH/Rockstar.png"!"":"FBTN" '@bash -c "button_click PW_ROCKSTAR"' \ --field=" vkPlay Games Center"!"$PW_GUI_ICON_PATH/mygames.png"!"":"FBTN" '@bash -c "button_click PW_VKPLAY"' \ diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index cf3378d..fffa132 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=2135 +#SCRIPTS_NEXT_VERSION=2136 ######################################################################## 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