From b48462519a2b747cf94fa864c99f5ecaaa08bb34 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Mon, 15 May 2023 13:09:38 +0300 Subject: [PATCH] Scripts version 2184 --- data_from_portwine/changelog_eng | 3 +++ data_from_portwine/changelog_rus | 3 +++ data_from_portwine/scripts/portwine_db/eve | 2 +- .../scripts/pw_autoinstall/PW_EVE | 20 +++++++------------ data_from_portwine/scripts/runlib | 6 +++++- data_from_portwine/scripts/var | 2 +- 6 files changed, 20 insertions(+), 16 deletions(-) diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 00538d4e..243772a9 100755 --- 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 2184### +* FIX for EveLauncher + ###Scripts version 2183### * minor fixes * updated versions: diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 9782f6a5..17c007fc 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,9 @@ ----------------------------------------- История изменений: +###Scripts version 2184### +* фикс установки EveLauncher + ###Scripts version 2183### * небольшие изменения функции скачивания * добавлен экспериментальный префикс PROGRAMS diff --git a/data_from_portwine/scripts/portwine_db/eve b/data_from_portwine/scripts/portwine_db/eve index 48894c5f..f6626f3f 100755 --- a/data_from_portwine/scripts/portwine_db/eve +++ b/data_from_portwine/scripts/portwine_db/eve @@ -5,7 +5,7 @@ #Rating=5 #####################examples########################### ##export PW_COMMENT_DB="blablabla" -export PW_WINE_USE=PROTON_GE +# export PW_WINE_USE=PROTON_GE export PW_VULKAN_USE=1 #export PW_WINDOWS_VER=7 # Set windows version 10, 7 or XP export PW_DLL_INSTALL="vcrun2019 d3dcompiler_47" # Install DDL in port prefix (used winetricks) diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EVE b/data_from_portwine/scripts/pw_autoinstall/PW_EVE index c2b5cb50..b5165e06 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EVE +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EVE @@ -3,22 +3,16 @@ ######################################################################## export PW_WINDOWS_VER=10 export PW_DLL_INSTALL="vcrun2017" -export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/EveLauncher-1892908.exe" +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/EveLauncher-2198233.exe" start_portwine -if try_download "binaries.eveonline.com/EveLauncher-1892908.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "binaries.eveonline.com/EveLauncher-2198233.exe" "${PW_AUTOINSTALL_EXE}" then - pw_start_progress_bar_block "${loc_gui_installing_the} EVE Launcher. ${loc_gui_please_wait} " - if [ ! -f "$WINEPREFIX/drive_c/Games/EVE Online/Launcher/evelauncher.exe" ] ; then - try_remove_dir "$WINEPREFIX/drive_c/Games/EVE Online" - dd if="${PW_AUTOINSTALL_EXE}" of="${PW_AUTOINSTALL_EXE}".7z bs=1M skip=31646603 count=196171208 iflag=skip_bytes,count_bytes - "$pw_7z" x "${PW_AUTOINSTALL_EXE}".7z -o"$WINEPREFIX/drive_c/Games/EVE Online" - try_remove_file "${PW_AUTOINSTALL_EXE}" - try_remove_file "${portwine_exe}.ppdb" - try_remove_file "${PW_AUTOINSTALL_EXE}" - try_remove_file "${portwine_exe}.ppdb".7z - fi - portwine_exe="$WINEPREFIX/drive_c/Games/EVE Online/Launcher/evelauncher.exe" + pw_kill_autostart evelauncher.exe & + pw_run "${PW_AUTOINSTALL_EXE}" + portwine_exe=`find "$WINEPREFIX/drive_c/" -type f -name "evelauncher.exe"` pw_stop_progress_bar portwine_create_shortcut + try_remove_file "${PW_AUTOINSTALL_EXE}" + try_remove_file "${portwine_exe}.ppdb" fi stop_portwine diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 048aa276..7e561c9e 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -199,6 +199,10 @@ start_portwine () { if [[ -x "`which "gamemoderun" 2>/dev/null`" ]] && [[ "$PW_USE_GAMEMODE" = "1" ]] ; then export GAMEMODERUN=1 PW_GAMEMODERUN_SLR="gamemoderun" + # if [[ ! -z "${PW_LD_PRELOAD}" ]] + # then export PW_LD_PRELOAD="${PW_LD_PRELOAD}:${MANGOHUD_LIB_NAME}" + # else export PW_LD_PRELOAD="${MANGOHUD_LIB_NAME}" + # fi systemctl enable --now --user gamemoded &>/dev/null echo "Gamemod will be launched." else @@ -232,7 +236,7 @@ start_portwine () { try_force_link_file "${WINEDIR}/share/wine/fonts/"tahoma.ttf "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/windows/Fonts/"tahoma.ttf } - PROGPFX_URL="github.com/Castro-Fidel/PortWINE/releases/download/progpfx${DEFPFX_VER}/progpfx${DEFPFX_VER}.tar.xz" + PROGPFX_URL="github.com/Castro-Fidel/PortWINE/releases/download/progpfx${PROGPFX_VER}/progpfx${PROGPFX_VER}.tar.xz" if [[ "${PW_PREFIX_NAME}" == "PROGRAMS" && ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/.progpfx ]] ; then print_info "Download and install PROGRAMS pfx..." if try_download "${PROGPFX_URL}" "${PORT_WINE_PATH}/data/tmp/progpfx.tar.xz" ; then diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index a12acc54..85d625f4 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=2183 +#SCRIPTS_NEXT_VERSION=2184 ######################################################################## 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