Commit cfbcf69d authored by Mikhail Tergoev's avatar Mikhail Tergoev

Scripts version 2210

parent 0fff71a8
...@@ -2,6 +2,12 @@ You can help us in the development of the project on the website: boosty.to/linu ...@@ -2,6 +2,12 @@ You can help us in the development of the project on the website: boosty.to/linu
----------------------------------------- -----------------------------------------
Changelog: Changelog:
###Scripts version 2210### Date: 28.07.2023 / Update download size: 9 megabytes.
* fix install and run (need tests):
BattleNET
STEAM_PP
* minor scripts changes
###Scripts version 2209### Date: 26.07.2023 / Update download size: 9 megabytes. ###Scripts version 2209### Date: 26.07.2023 / Update download size: 9 megabytes.
* added "Battle Of Space Raiders" autoinstall (thanks Boria138) * added "Battle Of Space Raiders" autoinstall (thanks Boria138)
* minor improvements by Boria138 * minor improvements by Boria138
......
...@@ -2,6 +2,12 @@ ...@@ -2,6 +2,12 @@
----------------------------------------- -----------------------------------------
История изменений: История изменений:
###Scripts version 2210### Дата: 28.07.2023 / Размер скачиваемого обновления: 9 мегабайт.
* исправлены установка и обновление лончеров (требуется тест на разных системах):
BattleNET
STEAM_PP
* множество небольших изменений скриптов
###Scripts version 2209### Дата: 26.07.2023 / Размер скачиваемого обновления: 9 мегабайт. ###Scripts version 2209### Дата: 26.07.2023 / Размер скачиваемого обновления: 9 мегабайт.
* добавлена автоустановка игры: "Battle Of Space Raiders" (спасибо Boria138) * добавлена автоустановка игры: "Battle Of Space Raiders" (спасибо Boria138)
* приняты небольшие исправления от Boria138 * приняты небольшие исправления от Boria138
......
...@@ -376,9 +376,6 @@ init_wine_ver () { ...@@ -376,9 +376,6 @@ init_wine_ver () {
mv -f "${WINEDIR}/lib/wine/x86_64-windows" "${WINEDIR}/lib64/wine/" mv -f "${WINEDIR}/lib/wine/x86_64-windows" "${WINEDIR}/lib64/wine/"
fi fi
try_remove_file "${WINEDIR}/lib/libsteam_api.so"
try_remove_file "${WINEDIR}/lib64/libsteam_api.so"
for mono_gecko_chk in "mono" "gecko" ; do for mono_gecko_chk in "mono" "gecko" ; do
if check_symlink "${WINEDIR}/share/wine/${mono_gecko_chk}" ; then if check_symlink "${WINEDIR}/share/wine/${mono_gecko_chk}" ; then
print_info "${WINEDIR}/share/wine/${mono_gecko_chk} is symlink. OK." print_info "${WINEDIR}/share/wine/${mono_gecko_chk} is symlink. OK."
...@@ -403,6 +400,10 @@ init_wine_ver () { ...@@ -403,6 +400,10 @@ init_wine_ver () {
sed -i '/winemenubuilder/d' "${WINEDIR}/share/wine/wine.inf" sed -i '/winemenubuilder/d' "${WINEDIR}/share/wine/wine.inf"
fi fi
fi fi
rm -f "${WINEDIR}"/*/*steam* &>/dev/null
rm -f "${WINEDIR}"/*/wine/*/*steam* &>/dev/null
return 0 return 0
} }
...@@ -431,14 +432,13 @@ pw_init_runtime () { ...@@ -431,14 +432,13 @@ pw_init_runtime () {
if [ "${PW_USE_GSTREAMER}" = 1 ] ; then if [ "${PW_USE_GSTREAMER}" = 1 ] ; then
if [ -d "${WINEDIR}/lib64/gstreamer-1.0" ] ; then if [ -d "${WINEDIR}/lib64/gstreamer-1.0" ] ; then
export GST_PLUGIN_SYSTEM_PATH_1_0="${WINEDIR}/lib64/gstreamer-1.0:${WINEDIR}/lib/gstreamer-1.0" export GST_PLUGIN_SYSTEM_PATH_1_0="${WINEDIR}/lib64/gstreamer-1.0:${WINEDIR}/lib/gstreamer-1.0"
elif [ -d "${PW_WINELIB}/portable/lib/lib64/gstreamer-1.0" ] ; then
export GST_PLUGIN_SYSTEM_PATH_1_0="${PW_WINELIB}/portable/lib/lib64/gstreamer-1.0:${PW_WINELIB}/portable/lib/lib32/gstreamer-1.0"
fi fi
export WINE_GST_REGISTRY_DIR="${PORT_WINE_TMP_PATH}" create_new_dir "${WINEDIR}"/gstreamer_tmp/
export MEDIACONV_AUDIO_DUMP_FILE="${PORT_WINE_TMP_PATH}"/audio.foz export WINE_GST_REGISTRY_DIR="${WINEDIR}"/gstreamer_tmp/
export MEDIACONV_AUDIO_TRANSCODED_FILE="${PORT_WINE_TMP_PATH}"/transcoded_audio.foz export MEDIACONV_AUDIO_DUMP_FILE="${WINEDIR}"/gstreamer_tmp/audio.foz
export MEDIACONV_VIDEO_DUMP_FILE="${PORT_WINE_TMP_PATH}"/video.foz export MEDIACONV_AUDIO_TRANSCODED_FILE="${WINEDIR}"/gstreamer_tmp/transcoded_audio.foz
export MEDIACONV_VIDEO_TRANSCODED_FILE="${PORT_WINE_TMP_PATH}"/transcoded_video.foz export MEDIACONV_VIDEO_DUMP_FILE="${WINEDIR}"/gstreamer_tmp/video.foz
export MEDIACONV_VIDEO_TRANSCODED_FILE="${WINEDIR}"/gstreamer_tmp/transcoded_video.foz
else else
var_winedlloverride_update "winegstreamer=" var_winedlloverride_update "winegstreamer="
fi fi
......
...@@ -80,9 +80,6 @@ start_portwine () { ...@@ -80,9 +80,6 @@ start_portwine () {
export DXVK_NVAPI_LOG_LEVEL=none export DXVK_NVAPI_LOG_LEVEL=none
fi fi
#default wine-mono override for FNA games
export WINE_MONO_OVERRIDES="Microsoft.Xna.Framework.*,Gac=n"
if [[ "${PW_NO_ESYNC}" == 1 ]] if [[ "${PW_NO_ESYNC}" == 1 ]]
then export WINEESYNC="0" then export WINEESYNC="0"
else export WINEESYNC="1" else export WINEESYNC="1"
...@@ -326,6 +323,15 @@ start_portwine () { ...@@ -326,6 +323,15 @@ start_portwine () {
if [ ! -d "${WINEPREFIX}/drive_c/users/steamuser/My Documents" ] if [ ! -d "${WINEPREFIX}/drive_c/users/steamuser/My Documents" ]
then try_force_link_dir "${WINEPREFIX}/drive_c/users/steamuser/Documents" "${WINEPREFIX}/drive_c/users/steamuser/My Documents" then try_force_link_dir "${WINEPREFIX}/drive_c/users/steamuser/Documents" "${WINEPREFIX}/drive_c/users/steamuser/My Documents"
fi fi
create_new_dir "${WINEPREFIX}/drive_c/users/steamuser/AppData/Roaming"
if [ ! -d "${WINEPREFIX}/drive_c/users/steamuser/Application Data" ]
then try_force_link_dir "${WINEPREFIX}/drive_c/users/steamuser/AppData/Roaming" "${WINEPREFIX}/drive_c/users/steamuser/Application Data"
fi
create_new_dir "${WINEPREFIX}/drive_c/users/steamuser/AppData/Local"
create_new_dir "${WINEPREFIX}/drive_c/users/steamuser/Local Settings"
if [ ! -d "${WINEPREFIX}/drive_c/users/steamuser/Local Settings/Application Data" ]
then try_force_link_dir "${WINEPREFIX}/drive_c/users/steamuser/AppData/Local" "${WINEPREFIX}/drive_c/users/steamuser/Local Settings/Application Data"
fi
#enabled BattleEye_Runtime and EasyAntiCheat_Runtime #enabled BattleEye_Runtime and EasyAntiCheat_Runtime
if [[ "${PW_USE_EAC_AND_BE}" == 1 ]] ; then if [[ "${PW_USE_EAC_AND_BE}" == 1 ]] ; then
export PROTON_BATTLEYE_RUNTIME="${PW_PLUGINS_PATH}/BattlEye_Runtime" export PROTON_BATTLEYE_RUNTIME="${PW_PLUGINS_PATH}/BattlEye_Runtime"
...@@ -384,7 +390,7 @@ start_portwine () { ...@@ -384,7 +390,7 @@ start_portwine () {
print_info "Use OpenGL" print_info "Use OpenGL"
export GL_YIELD="NOTHING" export GL_YIELD="NOTHING"
export mesa_glthread=true export mesa_glthread=true
var_winedlloverride_update "d3d11,d3d10,d3d10core,d3d10_1,d3d9,dxgi=b;d3d12,d3d12core=" var_winedlloverride_update "d3d11,d3d10,d3d10core,d3d10_1,d3d9,wined3d9,dxgi=b;d3d12,d3d12core="
elif [[ "${PW_VULKAN_USE}" == "3" ]] ; then elif [[ "${PW_VULKAN_USE}" == "3" ]] ; then
print_info "Use GALLIUM-NINE (Native DX9 on MESA drivers)" print_info "Use GALLIUM-NINE (Native DX9 on MESA drivers)"
export PW_GALLIUM_NINE_VER="0.8" export PW_GALLIUM_NINE_VER="0.8"
...@@ -499,7 +505,7 @@ start_portwine () { ...@@ -499,7 +505,7 @@ start_portwine () {
unset WINE_FULLSCREEN_FAKE_CURRENT_RES WINE_FULLSCREEN_FSR_STRENGTH WINE_FULLSCREEN_INTEGER_SCALING unset WINE_FULLSCREEN_FAKE_CURRENT_RES WINE_FULLSCREEN_FSR_STRENGTH WINE_FULLSCREEN_INTEGER_SCALING
fi fi
for try_cp_dll_from_wine in "ntdll.dll" "vulkan-1.dll" "winevulkan.dll" ; do for try_cp_dll_from_wine in "ntdll.dll" "vulkan-1.dll" "winevulkan.dll" "amd_ags_x64.dll" "ir50_32.dll" ; do
if try_copy_file "${WINEDIR}/lib/wine/i386-windows/${try_cp_dll_from_wine}" "${WINEPREFIX}/drive_c/windows/syswow64/${try_cp_dll_from_wine}" if try_copy_file "${WINEDIR}/lib/wine/i386-windows/${try_cp_dll_from_wine}" "${WINEPREFIX}/drive_c/windows/syswow64/${try_cp_dll_from_wine}"
then print_info "Try copy $try_cp_dll_from_wine to syswow64... OK." then print_info "Try copy $try_cp_dll_from_wine to syswow64... OK."
elif ! try_copy_file "${WINEDIR}/lib/wine/fakedlls/${try_cp_dll_from_wine}" "${WINEPREFIX}/drive_c/windows/syswow64/${try_cp_dll_from_wine}" elif ! try_copy_file "${WINEDIR}/lib/wine/fakedlls/${try_cp_dll_from_wine}" "${WINEPREFIX}/drive_c/windows/syswow64/${try_cp_dll_from_wine}"
......
#!/usr/bin/env bash #!/usr/bin/env bash
#Author: Castro-Fidel (linux-gaming.ru) #Author: Castro-Fidel (linux-gaming.ru)
#SCRIPTS_NEXT_VERSION=2209 #SCRIPTS_NEXT_VERSION=2210
######################################################################## ########################################################################
export PW_MANGOHUD=0 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 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
...@@ -22,6 +22,7 @@ export PW_USE_GSTREAMER="1" ...@@ -22,6 +22,7 @@ export PW_USE_GSTREAMER="1"
export PW_USE_D3D_EXTRAS="1" export PW_USE_D3D_EXTRAS="1"
export PW_PREFIX_NAME="DEFAULT" export PW_PREFIX_NAME="DEFAULT"
export WINE_WIN_START="start /wait /high /unix" export WINE_WIN_START="start /wait /high /unix"
export WINE_ALLOW_XIM="0"
export PW_USE_SHADER_CACHE="1" export PW_USE_SHADER_CACHE="1"
export STAGING_SHARED_MEMORY="1" export STAGING_SHARED_MEMORY="1"
export PROTON_DISABLE_LSTEAMCLIENT="0" export PROTON_DISABLE_LSTEAMCLIENT="0"
...@@ -43,8 +44,8 @@ export PW_GE_VER="8-3" ...@@ -43,8 +44,8 @@ export PW_GE_VER="8-3"
export PW_PROTON_GE_VER="PROTON_GE_${PW_GE_VER}" export PW_PROTON_GE_VER="PROTON_GE_${PW_GE_VER}"
export PW_WINE_FULLSCREEN_FSR="1" export PW_WINE_FULLSCREEN_FSR="1"
###DXVK_AND_VKD3D### ###DXVK_AND_VKD3D###
# export VKD3D_FEATURE_LEVEL=12_1 export VKD3D_FEATURE_LEVEL="12_0"
export VKD3D_LIMIT_TESS_FACTORS="16" # export VKD3D_LIMIT_TESS_FACTORS="16"
export DXVK_STABLE_VER="1.10.3-28" export DXVK_STABLE_VER="1.10.3-28"
export DXVK_GIT_VER="2.2-137" export DXVK_GIT_VER="2.2-137"
export VKD3D_STABLE_VER="1.1-2602" export VKD3D_STABLE_VER="1.1-2602"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment