From 2029bb8275d03004d00ccbb46a4bccf688e9b473 Mon Sep 17 00:00:00 2001 From: castro-fidel Date: Sun, 26 Jun 2022 17:49:07 +0300 Subject: [PATCH] Scripts version 2120 --- data_from_portwine/changelog_eng | 5 +++++ data_from_portwine/changelog_rus | 5 +++++ data_from_portwine/scripts/functions_helper | 11 ++++++++--- data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN | 6 +++--- data_from_portwine/scripts/runlib | 7 ++++--- data_from_portwine/scripts/start.sh | 2 +- data_from_portwine/scripts/var | 6 +++--- 7 files changed, 29 insertions(+), 13 deletions(-) diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 44865cdc..6b3b696e 100644 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,11 @@ You can help us in the development of the project on the website: boosty.to/port ----------------------------------------- Changelog: +###Scripts version 2120### +* updated "PROTON_GE" to version 7-21 +* updated "libs_v32" (Steam Runtime Snipers) +* updated installation of ORIGIN + ###Scripts version 2119### * HOTFIX - for PW_USE_D3D_EXTRAS * updated information about the project, developers and paid subscribers on boosty diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index f902f266..fb5791f0 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,11 @@ ----------------------------------------- История изменений: +###Scripts version 2120### +* обновлен "PROTON_GE" до версии 7-21 +* обновлен "libs_v32" (Steam Runtime Snipers) +* обновлена установка ORIGIN + ###Scripts version 2119### * исправлено и ускорено создание DOTNET префикса * HOTFIX - для PW_USE_D3D_EXTRAS diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index d22480f9..a83f116c 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -369,16 +369,16 @@ pw_init_runtime () { export pw_runtime="${PW_WINELIB}/pressure-vessel/bin/pressure-vessel-unruntime \ --unshare-home \ --home="${PW_SANDBOX_HOME_PATH}" \ - --no-gc-legacy-runtimes \ --no-gc-runtimes \ + --gc-legacy-runtimes \ --copy-runtime \ --remove-game-overlay \ ${PW_ADD_TO_ARGS_IN_RUNTIME} --" else export pw_runtime="${PW_WINELIB}/pressure-vessel/bin/pressure-vessel-unruntime \ --share-home \ - --no-gc-legacy-runtimes \ --no-gc-runtimes \ + --gc-legacy-runtimes \ --copy-runtime \ --remove-game-overlay \ ${PW_ADD_TO_ARGS_IN_RUNTIME} --" @@ -471,7 +471,12 @@ regdlloverrides () { esac grep 'HKCU,Software\\Wine\\AppDefaults\\'"${PW_DLL_EXE}"'\\DllOverrides,'\"${PW_DLL_LIB}\",0x2,\"${PW_DLL_IN_REG}\" "${WINEDIR}/share/wine/wine.inf" if [[ "$?" != "0" ]] ; then - sed -i "/\[SteamClient.ntamd64\]/a HKCU,Software\\\Wine\\\AppDefaults\\\\${PW_DLL_EXE}\\\DllOverrides,\"${PW_DLL_LIB}\",0x2,\"${PW_DLL_IN_REG}\"" "${WINEDIR}/share/wine/wine.inf" + grep "ProtonOverrides" "${WINEDIR}/share/wine/wine.inf" + if [[ "$?" == "0" ]] ; then + sed -i "/\[ProtonOverrides\]/a HKCU,Software\\\Wine\\\AppDefaults\\\\${PW_DLL_EXE}\\\DllOverrides,\"${PW_DLL_LIB}\",0x2,\"${PW_DLL_IN_REG}\"" "${WINEDIR}/share/wine/wine.inf" + else + sed -i "/\[SteamClient.ntamd64\]/a HKCU,Software\\\Wine\\\AppDefaults\\\\${PW_DLL_EXE}\\\DllOverrides,\"${PW_DLL_LIB}\",0x2,\"${PW_DLL_IN_REG}\"" "${WINEDIR}/share/wine/wine.inf" + fi fi } diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN b/data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN index 052cfae4..eb8a9662 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN +++ b/data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN @@ -1,13 +1,13 @@ #!/usr/bin/env bash # Author: Castro-Fidel (PortWINE-Linux.ru) ######################################################################## -export LAUNCH_PARAMETERS=("/silent" ) +export LAUNCH_PARAMETERS=("/silent" "/NoLaunch" ) export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/OriginSetup.exe" start_portwine -if try_download "download.dm.origin.com/origin/live/OriginSetup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "origin-a.akamaihd.net/Origin-Client-Download/origin/live/OriginThinSetup.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing the Origin. Please wait..." - pw_kill_autostart Origin.exe & + # pw_kill_autostart Origin.exe & pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Origin/Origin.exe" pw_stop_progress_bar diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index d8879f14..ecd3451a 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -66,6 +66,7 @@ start_portwine () { xrdb -merge "${HOME}/.Xresources" fi + export NOSTEAM=1 pw_init_runtime if [[ ! -z "${PW_LOG}" && "${PW_LOG}" != 0 ]] ; then @@ -288,9 +289,9 @@ start_portwine () { then try_force_link_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/steamuser/Documents" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/steamuser/My Documents" fi #enabled BattleEye_Runtime and EasyAntiCheat_Runtime - export PROTON_BATTLEYE_RUNTIME="${PW_PLUGINS_PATH}/d3d_extras/BattlEye_Runtime" - export PROTON_EAC_RUNTIME="${PW_PLUGINS_PATH}/d3d_extras/EasyAntiCheat_Runtime" - export PROTON_EASYANTICHEAT_RUNTIME="${PROTON_EAC_RUNTIME}" + export PROTON_BATTLEYE_RUNTIME="${PW_PLUGINS_PATH}/BattlEye_Runtime" + export PROTON_EAC_RUNTIME="${PW_PLUGINS_PATH}/EasyAntiCheat_Runtime" + # export PROTON_EASYANTICHEAT_RUNTIME="${PROTON_EAC_RUNTIME}" var_winedlloverride_update "beclient,beclient_x64=b" #try link d3d extras libs for d3d_extras_from_plugins in d3dcompiler_33 d3dcompiler_34 d3dcompiler_35 d3dcompiler_36 d3dcompiler_37 \ diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index c402e6cf..3f8b0dc8 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -138,7 +138,7 @@ portwine_start_debug () { "${PW_WINELIB}/portable/bin/inxi" -G >> "${PORT_WINE_PATH}/${portname}.log" echo "----------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "Vulkan info device name:" >> "${PORT_WINE_PATH}/${portname}.log" - "${PW_WINELIB}/portable/bin/vulkaninfo" | grep deviceName >> "${PORT_WINE_PATH}/${portname}.log" + [[ `which vulkaninfo` ]] && vulkaninfo | grep deviceName >> "${PORT_WINE_PATH}/${portname}.log" "${PW_WINELIB}/portable/bin/vkcube" --c 50 if [ $? -eq 0 ]; then echo "Vulkan cube test passed successfully" >> "${PORT_WINE_PATH}/${portname}.log" diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index f084e5a1..20011e39 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (PortWINE-Linux.ru) -#SCRIPTS_NEXT_VERSION=2119 +#SCRIPTS_NEXT_VERSION=2120 ######################################################################## 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 @@ -21,7 +21,7 @@ export PW_USE_TERMINAL="0" export PW_WINEDBG_DISABLE="1" export PW_WINDOWS_VER="10" export WINEARCH="win64" -export PW_LIBS_VER="_v31" +export PW_LIBS_VER="_v32" export PORTWINE_URL="https://portwine-linux.ru/" export GDK_BACKEND="x11" export PW_USE_GSTREAMER="1" @@ -38,7 +38,7 @@ export PW_PLUGINS_VER="_v5" export PW_STEAM_VER="7.0-3" export PW_PROTON_STEAM_VER="PROTON_STEAM_${PW_STEAM_VER}" ###WINE_PROTON_GE### -export PW_GE_VER="7-20" +export PW_GE_VER="7-21" export PW_PROTON_GE_VER="PROTON_GE_${PW_GE_VER}" export PW_WINE_FULLSCREEN_FSR="0" ###WINE_PROTON_PW_FOR_GALLIUM_NINE###