diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index faf6c3b6..44865cdc 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 2119### +* HOTFIX - for PW_USE_D3D_EXTRAS +* updated information about the project, developers and paid subscribers on boosty +* added optimization of games and applications when using a Wayland session (using direct launch, not using XWayland) + ###Scripts version 2118### * PW_USE_D3D_EXTRAS is back on by default (except WGC) * updated "PROTON_STEAM" to version 7.0-3 diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 832c9ba4..f902f266 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,10 +2,16 @@ ----------------------------------------- История изменений: +###Scripts version 2119### +* исправлено и ускорено создание DOTNET префикса +* HOTFIX - для PW_USE_D3D_EXTRAS +* обновлена информация о проекте, разработчиках и платных подписчиков на boosty +* добавлена оптимизация игр и приложений при использовании сесcии Wayland (используется прямой запуск, не используя XWayland) + ###Scripts version 2118### * переменная PW_USE_D3D_EXTRAS снова включена по умолчанию (кроме WGC) * обновлен "PROTON_STEAM" до версии 7.0-3 -* добавлена информация о проекте, разработчиках и донатеров (тестовый режим) +* добавлена информация о проекте, разработчиках и платных подписчиков на boosty (тестовый режим) ###Scripts version 2117### * исправлена установка и запуск World of Sea Battle @@ -894,7 +900,7 @@ PS: не забывает для активации добавить перем ###PortProton-75### 24.04.2021 ###Scripts version 1040### * обновлен wine Proton experimental 6.3 от 23.04.2021 -* добавлена функция pw_clear_pfx для отчистки префикса порта во время обновления без затрагивания игр и программ +* добавлена функция pw_clear_pfx для очистки префикса порта во время обновления без затрагивания игр и программ * проверка и настройка переменных для MANGOHUD добавлены функцию pw_mangohud_check * версия VKD3D по умолчанию = 2.3 * добавлена поддержка DXR (RTX) в режиме VKD3D, при условии использования переменной PW_USE_DXR10=1 @@ -910,7 +916,7 @@ PS: не забывает для активации добавить перем * ускорена работа reset скрипта останавливающая все процессы порта * исправлены ошибки связанные с остановкой отсутствующих pid-оф yad и процессов wine. * удалено использование wineserver -k в функции kill_portwine (влияло на инициализацию префикса) -* добавлена отчистка ~/.PortWINE, при условии установки новой версии порта +* добавлена очистка ~/.PortWINE, при условии установки новой версии порта * добавлена вся информация из db файла и winetricks.log в debug * удален каталог vars (из за db файлоа больше в нем нет необходимости) * скрипт PortProton_vars перенесен в каталог scripts и переименован в var diff --git a/data_from_portwine/scripts/credits b/data_from_portwine/scripts/credits index 054c229d..267a95ac 100755 --- a/data_from_portwine/scripts/credits +++ b/data_from_portwine/scripts/credits @@ -1,9 +1,10 @@ -#! /bin/sh -"${pw_yad_new}" --plug=10 --tabnum=1 --show-uri \ ---text-align=center --text="PortProton v.${install_ver} -scripts v. ${scripts_install_ver} +#!/usr/bin/env bash -Программа для запуска Windows игр и приложений в GNU/Linux +KEY_CREDITS=$RANDOM + +"${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=1 --show-uri \ +--text-align=center --scroll --text="PortProton v.${install_ver} +scripts v. ${scripts_install_ver} https://portwine-linux.ru @@ -13,22 +14,26 @@ This program comes with absolutely no warranty. See the License for details." & -"${pw_yad_new}" --plug=10 --tabnum=2 \ ---text-align=center --text="Author: Casro-Fidel +"${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=2 \ +--text-align=center --scroll --text="Author: Casro-Fidel (Mikhail Tergoev) -Development assistants: +Developer assistants and testers: Cefeiko Dezert1r Taz_mania Anton_Famillianov -gavr RidBowt chal55rus UserDiscord +survolog +gavr +RusNor +aldiserg +an9949an +andrey4korop +" & -Список будет дополнятся..." & - -"${pw_yad_new}" --plug=10 --tabnum=3 --text-info <<< "MIT License +"${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=3 --text-info --scroll <<< "MIT License Copyright (©) 2022 Castro-Fidel (PortWINE-Linux.ru) @@ -50,37 +55,204 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." & -"${pw_yad_new}" --plug=10 --tabnum=4 \ ---text-align=center \ ---text="Sponsors: -Cefeiko -Dezert1r -Taz_mania -Anton_Famillianov -gavr -RidBowt -chal55rus -UserDiscord -Александр -Сергей 33(46)RUS +"${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=4 \ +--text-info --show-uri --scroll <<< 'https://boosty.to/portwine-linux.ru: + +1 1 +A B +AdamArclight666 +Akai +Aleks +Alex Sh +Alexsei Cherniavskiy +Allegra_g +AlxChkln +Andrei K +Another games +Apofis Smab Aule Mahal -CyberBoar -Evgen -johny -Maksami -MRModer +Azartiny Mor +BELIJJAaL +CanBoo +Coin Hunt +Cruze +DIO +Dadenard +Dallasss +Daniil Go +Dencher12 +Denis +Dezert1r +Dima Manshin +Dmitriy Tokarev +Drakorgaur +El Mago +Eliot +Ethan Winters +Evgen Buiko +EvilDevolver +GaiverX +Gekko +Geomant17 +Happy Husky +Homyakin +Ivan Vlasov +LeGi0neR +Lexa XLS +Linux Vumtut +Lonely Lonely +MICROFARAT +MLogaut +Maksami Cordyceps +Maktub +Melord +Monti Roquefort +MrBatonio +Nesterik +Nikola P. +Nuclearsun +Nurik +Oleg55Rus +Optimus +Ottakvot +PLAFON Pependos -Phoenix55rus +PlagueEvgeny +Rojok56 +Ruslan Vlasov +Rustam +Saireg +Seeropoonya +Soma +StGdG +Subscript +Sudo Connect +Taras Zagibalov +The End +Tykva +V1ktr +VAtiB +VUMtut +VanBugel +Vikthor Prieto +Vosarat +Windchester Xpamych -Виндета(рот) -Ка6адОнНа -ХОЛО МУДРАЯ +Yurec +Yuri Emelyanov +Zillah Giovanni +Zloy Ivan +Zorit +amikha1lov +anisan_sg +apolon +benya +chal55rus(Sergey P.) +d.kostroma +dunkanMcLoud +dupster mailbox +fight fox +funti2f +fusiok +gg_harper +haravara +ivboss +ksandr4370 +onix +paulscathedral +penguin4ek +sanelasan +sashman +sendependa_dio +shecspir +sship +sugoyako +tima +ua3dko +vlad petrov +wrager +xpamych +Александр +Александр Абдулов +Александр Кладов +Александр Лобанов +Алексей Ultralin +Алексей Войтенко +Алексей Галаш +Алексей Зубрийчук +Алексей Ивушкин +Алексей Кравчук +Алексей Чугунов +Андрей Гусаков +Андрей Карпенцов +Антон Рудковский +Антон Фамилианов +Антоний Дамикан +Артём К. +Валерий Толмачёв +Виктор Шварц +Виктор Щетинин +Виндэта(рог) +Виталий Нуров +Влад Блинов +Влад Кладиев +Владимир Бильдюкевич +Владимир Дарвин +Вячеслав Шитюков +Вячеслав Шустров +Георгий Гурский +Данил Павлов +Дед Мазай +Денис Мальцев +Денис Матій +Денис Олефиренко +Дмитрий Круглов +Дмитрий Мазанка +Дмитрий Сидоров +Евгений Бебин +Евгений Долгополов +Евгений Хирвонен +Евгений Храмов +Егор Кречун +Женя Рябушкин +Иван Белекеев +Коляныч Королёв +Константин __ +Константин Абадонна +Леонид +Максим Хмара-Миронов +Маленькая сосна +Марат +Марат Рахимов +Неизвестый Дмитрий +Никита Булавин +Павел Иванов +Павел Пашенцев +Равич Ревес +Рамиль +Рома Б. +Роман Игнатьев +Роман Паженский +Саша +Семён Клишин +Семён Ярополов +Сергей Казёнкин +Сергей Круглов +Серёга Сапрыкин +Стас Толкачёв +Тима Суеубаев +Тимофей Ковалев +Тимур Сафонов +Удалить Аккаунт +Хоттабыч +Николай Гинтов -Список будет дополнятся..." & -"${pw_yad_new}" --plug=10 --tabnum=5 --text="Хотите присоединится и помочь в развитии проекта:" \ +Список будет дополняться...' & + +"${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=5 --text="Хотите присоединится и помочь в развитии проекта:" \ --title=JOIN --window-icon=group --image=system-config-users --uri-color=red --show-uri \ ---text-info <<< \ +--text-info --scroll <<< \ "Website: http://portwine-linux.ru Discord: http://discord.gg/yJSEFjF VK: https://vk.com/portwinelinux @@ -94,7 +266,7 @@ Yandex кошельк: 410012267513818 Задонатить на стрим: https://www.donationalerts.com/r/portwine_linux" & -"${pw_yad_new}" --plug=10 --tabnum=6 --show-uri --title="THIRD PARTY LIBRARIES" \ +"${pw_yad_new}" --plug="${KEY_CREDITS}" --tabnum=6 --show-uri --title="THIRD PARTY LIBRARIES" \ --text-info <<< "Сторонние библиотеки, которые используются в PortProton PortProton собран на основе следующих бесплатных библиотек программного обеспечения: @@ -104,7 +276,7 @@ WINE-PROTON-GE: https://github.com/GloriousEggroll/proton-ge-custom/ YAD: https://github.com/v1cont/"${pw_yad_new}" ZENITY: https://github.com/GNOME/zenity" & -"${pw_yad_new}" --title "ABOUT US" --key=10 --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ +"${pw_yad_new}" --title "ABOUT US" --key="${KEY_CREDITS}" --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ --center --notebook --no-buttons --tab-pos=bottom \ --tab="ABOUT PORTPROTON" --tab="AUTORS" --tab="LICENSE" --tab="SPONSORS" --tab="JOIN" \ --tab="THIRD PARTY LIBRARIES" diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index 705a2f51..ee109f94 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -103,7 +103,7 @@ then export PW_DX12_DISABLE_INFO='Принудительное отключение DirectX 12' export PW_USE_WINE_DXGI_INFO='Принудительное использование встроенной библиотеки DXGI (в редких случаях решает проблемы с запуском игр под DX12)' export PW_MANGOHUD_USER_CONF_INFO='Принудительное использование системных настроек MANGOHUD (GOverlay и т.п.)' - export PW_USE_D3D_EXTRAS='Включить принудительное использование сторонних библиотек DirectX' + export PW_USE_D3D_EXTRAS_INFO='Включить принудительное использование сторонних библиотек DirectX' export PW_PRIME_RENDER_OFFLOAD_INFO='Включить дискретную видеокарту NVIDIA для ноутбуков с гибридной графикой (при поддержке установленого драйвера в ОС)' export PW_USE_WINDOWS_7_INFO='Изменить версию WINDOWS 10 на WINDOWS 7 в префиксе' export PW_USE_AMDVLK_DRIVER_INFO='Использовать драйвер AMDVLK вместо RADV на видеокартах от AMD' diff --git a/data_from_portwine/scripts/portwine_db/MWO_Portal.exe.ppdb b/data_from_portwine/scripts/portwine_db/MWO_Portal.exe.ppdb new file mode 100644 index 00000000..1ee08ac7 --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/MWO_Portal.exe.ppdb @@ -0,0 +1,51 @@ +#!/usr/bin/env bash +#Author: dez +#MWO Portal.exe +#Rating=1-5 +#####################examples########################### +##export PW_COMMENT_DB="blablabla" +export PW_WINDOWS_VER="10" +export PW_DLL_INSTALL="" +export WINEDLLOVERRIDES="" +export LAUNCH_PARAMETERS="-noprompt -anygpu" +export PW_WINE_USE="PROTON_GE" +export PW_VULKAN_USE="1" +export PW_USE_DXR10="0" +##export PW_DLSS_ON=1 +##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN +export PW_USE_NVAPI_AND_DLSS="0" +export PW_OLD_GL_STRING="0" +export PW_HIDE_NVIDIA_GPU="0" +export PW_FORCE_USE_VSYNC="0" +export PW_VIRTUAL_DESKTOP="0" +##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue +export ENABLE_VKBASALT="1" +export PW_VKBASALT_EFFECTS="FakeHDR:cas" +export PW_VKBASALT_FFX_CAS="0.75" +export PW_NO_FSYNC="0" +export PW_NO_ESYNC="1" +export PW_USE_GSTREAMER="1" +##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games +##export PW_NO_WRITE_WATCH=1 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). +export PW_HEAP_DELAY_FREE="0" +export PW_WINE_ALLOW_XIM="0" +##export WINEARCH=win32 # defaut = win64 +##export WINEPREFIX= +export PW_WINEDBG_DISABLE="1" +export PW_USE_TERMINAL="0" +export PW_GUI_DISABLED_CS="0" +##export PATH_TO_GAME= +##add_in_start_portwine () { commands ; } +export PW_PREFIX_NAME="DOTNET" +export PW_MANGOHUD="1" +export PW_MANGOHUD_USER_CONF="1" +export PW_USE_DXR11="0" +export PW_WINE_FULLSCREEN_FSR="0" +export PW_USE_GAMEMODE="1" +export PW_DX12_DISABLE="0" +export PW_PRIME_RENDER_OFFLOAD="0" +export PW_USE_D3D_EXTRAS="1" +export PW_FIX_VIDEO_IN_GAME="0" +export PW_USE_AMDVLK_DRIVER="0" +export PW_FORCE_LARGE_ADDRESS_AWARE="1" +export PW_USE_SHADER_CACHE="1" diff --git a/data_from_portwine/scripts/portwine_db/WolfNewOrder b/data_from_portwine/scripts/portwine_db/WolfNewOrder new file mode 100644 index 00000000..e99e52d6 --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/WolfNewOrder @@ -0,0 +1,51 @@ +#!/usr/bin/env bash +#Author: spider +#WolfNewOrder_x64.exe +#Rating=1-5 +#####################examples########################### +##export PW_COMMENT_DB="blablabla" +export PW_WINDOWS_VER="10" +export PW_DLL_INSTALL="" +export WINEDLLOVERRIDES="" +export LAUNCH_PARAMETERS="" +export PW_WINE_USE="PROTON_GE" +export PW_VULKAN_USE="1" +export PW_USE_DXR10="0" +##export PW_DLSS_ON=1 +##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN +export PW_USE_NVAPI_AND_DLSS="0" +export PW_OLD_GL_STRING="0" +export PW_HIDE_NVIDIA_GPU="0" +export PW_FORCE_USE_VSYNC="0" +export PW_VIRTUAL_DESKTOP="0" +##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue +export ENABLE_VKBASALT="0" +export PW_VKBASALT_EFFECTS="Curves:SMAA:cas" +export PW_VKBASALT_FFX_CAS="0.75" +export PW_NO_FSYNC="0" +export PW_NO_ESYNC="1" +export PW_USE_GSTREAMER="1" +##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games +##export PW_NO_WRITE_WATCH=1 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). +export PW_HEAP_DELAY_FREE="0" +export PW_WINE_ALLOW_XIM="0" +##export WINEARCH=win32 # defaut = win64 +##export WINEPREFIX= +export PW_WINEDBG_DISABLE="1" +export PW_USE_TERMINAL="0" +export PW_GUI_DISABLED_CS="0" +##export PATH_TO_GAME= +##add_in_start_portwine () { commands ; } +export PW_PREFIX_NAME="DEFAULT" +export PW_MANGOHUD="1" +export PW_MANGOHUD_USER_CONF="0" +export PW_USE_DXR11="0" +export PW_WINE_FULLSCREEN_FSR="0" +export PW_USE_GAMEMODE="1" +export PW_DX12_DISABLE="0" +export PW_PRIME_RENDER_OFFLOAD="0" +export PW_USE_D3D_EXTRAS="0" +export PW_FIX_VIDEO_IN_GAME="0" +export PW_USE_AMDVLK_DRIVER="0" +export PW_FORCE_LARGE_ADDRESS_AWARE="1" +export PW_USE_SHADER_CACHE="1" diff --git a/data_from_portwine/scripts/portwine_db/wot_encore_install_ru b/data_from_portwine/scripts/portwine_db/wot_encore_install_ru index 69b72428..66135f57 100755 --- a/data_from_portwine/scripts/portwine_db/wot_encore_install_ru +++ b/data_from_portwine/scripts/portwine_db/wot_encore_install_ru @@ -1,41 +1,13 @@ #!/usr/bin/env bash - #Author: user - #wot_encore_install_ru.exe - #Rating=1-5 - ################################################ - export PW_VULKAN_USE=dxvk - export PW_USE_TERMINAL=1 - export PW_PREFIX_NAME="DOTNET" - export PW_DLL_INSTALL="dotnet40 vcrun2017 mfc42 vb6run physx" - export PW_COMMENT_DB="World Of Tanks EnCore Installer" - export PW_USE_D3D_EXTRAS=0 - ## export DXVK_HUD=fps,devinfo - ## export PW_MANGOHUD=1 -#####################examples########################### -PW_INSTALL_DOTNET40 () { - export DN=dotNetFx40_Full_x86_x64.exe - export mscor=mscorsvw.exe - export KILL_MSCOR=0 - export DN_INST_SUCC=0 - - while [ ! -z "`ps -ax | grep PortProton | grep -m1 'start.sh' | awk '{print $1}'`" ] ; do - echo "PID parrent start.sh was found" - sleep 5 - while [ ! -z `pidof -s $DN` ] ; do - echo "$DN is runing.. Wait..." - sleep 5 - export DN_INST_SUCC=1 - done - while [ ! -z `pgrep "${mscor}" | head -n 1` ] && [ -z `pidof -s $DN` ] ; do - echo "$mscor was found. Kill it..." - kill -n 9 `pgrep "${mscor}" | head -n 1` - sleep 1 - export KILL_MSCOR=1 - done - if [ "$KILL_MSCOR" != 0 ] && [ "$DN_INST_SUCC" != 0 ] && [ -z `pidof -s $DN` ] && [ -z `pgrep "${mscor}" | head -n 1` ]; then - echo "All $mscor killed" - break - fi - done -} -PW_INSTALL_DOTNET40 & +#Author: user +#wot_encore_install_ru.exe +#Rating=1-5 +################################################ +export PW_VULKAN_USE=dxvk +export PW_USE_TERMINAL=1 +export PW_PREFIX_NAME="DOTNET" +export PW_DLL_INSTALL="dotnet40 vcrun2017 mfc42 vb6run physx" +export PW_COMMENT_DB="World Of Tanks EnCore Installer" +export PW_USE_D3D_EXTRAS=0 +## export DXVK_HUD=fps,devinfo +## export PW_MANGOHUD=1 diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_WOSB b/data_from_portwine/scripts/pw_autoinstall/PW_WOSB index cf4e6d62..c5cec796 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_WOSB +++ b/data_from_portwine/scripts/pw_autoinstall/PW_WOSB @@ -4,7 +4,7 @@ export PW_PREFIX_NAME="DOTNET" export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/wos_client.exe" export LAUNCH_PARAMETERS=("/VERYSILENT") -export PW_DLL_INSTALL="faudio dotnet48 dotnet20sp2" +export PW_DLL_INSTALL="faudio dotnet48" export PW_VULKAN_USE=1 if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index e19fdaeb..d8879f14 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -22,7 +22,6 @@ fi . "$(dirname $(readlink -f "$0"))/functions_helper" start_portwine () { - pw_update_pfx_cover_gui export WINEPREFIX="${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}" create_new_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/" try_force_link_dir "${PORT_WINE_PATH}/data/prefixes" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/" @@ -242,8 +241,25 @@ 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 } + + export DOTPFX_VER="48v1" + DOTPFX_URL="github.com/Castro-Fidel/PortWINE/releases/download/dotpfx${DOTPFX_VER}/dotpfx${DOTPFX_VER}.tar.xz" + + if [[ "${update_loc}" == "RUS" && "${PW_PREFIX_NAME}" == "DOTNET" && ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/.dotnet48 ]] ; then + print_info "Download and install DOTNET..." + if try_download "${DOTPFX_URL}" "${PORT_WINE_PATH}/data/tmp/dotpfx.tar.xz" ; then + unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/dotpfx.tar.xz" "${PORT_WINE_PATH}/data/prefixes/" + try_remove_file "${PORT_WINE_PATH}/data/tmp/dotpfx.tar.xz" + else + try_remove_file "${PORT_WINE_PATH}/data/tmp/dotpfx.tar.xz" + zenity_error_download && exit 1 + fi + fi - if [[ ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}" || ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/drive_c/windows || ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/dosdevices" || \ + pw_update_pfx_cover_gui + + + if [[ ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}" || ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/drive_c/windows || \ ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/userdef.reg || ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/system.reg || ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/user.reg ]] then pw_clear_pfx @@ -252,13 +268,11 @@ start_portwine () { cp -frL "${PW_PLUGINS_PATH}/default_pfx/"* "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/" fi ${pw_runtime} env LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" "${WINELOADER}" wineboot -u &>>"${PORT_WINE_TMP_PATH}/update_pfx_log" - # ${pw_runtime} env LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" "${WINESERVER}" -w &>>"${PORT_WINE_TMP_PATH}/update_pfx_log" wait_wineserver && echo "${PW_WINE_USE}" > "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver" - elif [[ -z "`cat "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver" | grep ${PW_WINE_USE}`" ]] ; then + elif [[ -z "`cat "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver" | grep ${PW_WINE_USE}`" || ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/dosdevices" ]] ; then check_dirs_and_files_in_pfx ${pw_runtime} env LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" "${WINELOADER}" wineboot -i &>>"${PORT_WINE_TMP_PATH}/update_pfx_log" - # ${pw_runtime} env LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" "${WINESERVER}" -w &>>"${PORT_WINE_TMP_PATH}/update_pfx_log" wait_wineserver && echo "${PW_WINE_USE}" > "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver" fi @@ -276,7 +290,8 @@ start_portwine () { #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" - var_winedlloverride_update "beclient,beclient_x64=b,n" + 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 \ d3dcompiler_38 d3dcompiler_39 d3dcompiler_40 d3dcompiler_41 d3dcompiler_42 d3dcompiler_43 d3dcompiler_46 \ @@ -514,6 +529,7 @@ start_portwine () { } pw_run () { + unset GDK_BACKEND if [[ ! -z "$portwine_exe" ]] ; then cd "${PATH_TO_GAME}" else @@ -589,35 +605,8 @@ if [[ -d "${PORT_WINE_PATH}/data/dist" ]] ; then fi create_new_dir "${PORT_WINE_PATH}/data/prefixes" -try_force_link_dir "${PORT_WINE_PATH}/data/prefixes" "${PORT_WINE_PATH}" -if [[ -d "${PORT_WINE_PATH}/data/pfx" ]] ; then - mv -f "${PORT_WINE_PATH}/data/pfx" "${PORT_WINE_PATH}/data/prefixes/DEFAULT" - orig_IFS="$IFS" - IFS=$'\n' - for change_path in `grep -il "/data/pfx/" "${HOME}/.local/share/applications"/*.desktop` ; do - sed -i 's%/data/pfx/%/data/prefixes/DEFAULT/%g' "${change_path}" - done - for change_path in `grep -il "/data/pfx/" "${PORT_WINE_PATH}"/*.desktop` ; do - sed -i 's%/data/pfx/%/data/prefixes/DEFAULT/%g' "${change_path}" - done - IFS="$orig_IFS" - rm -f "${PORT_WINE_PATH}/drive_c" -fi - -if [[ -d "${PORT_WINE_PATH}/data/pfx_dotnet" ]] ; then - mv -f "${PORT_WINE_PATH}/data/pfx_dotnet" "${PORT_WINE_PATH}/data/prefixes/DOTNET" - orig_IFS="$IFS" - IFS=$'\n' - for change_path in `grep -il "/data/pfx_dotnet/" "${HOME}/.local/share/applications"/*.desktop` ; do - sed -i 's%/data/pfx_dotnet/%/data/prefixes/DOTNET/%g' "${change_path}" - done - for change_path in `grep -il "/data/pfx_dotnet/" "${PORT_WINE_PATH}"/*.desktop` ; do - sed -i 's%/data/pfx_dotnet/%/data/prefixes/DOTNET/%g' "${change_path}" - done - IFS="$orig_IFS" -fi create_new_dir "${PORT_WINE_PATH}/data/prefixes/DOTNET" - +try_force_link_dir "${PORT_WINE_PATH}/data/prefixes" "${PORT_WINE_PATH}" orig_IFS="$IFS" IFS=$'\n' diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 6e59cd8e..f084e5a1 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=2118 +#SCRIPTS_NEXT_VERSION=2119 ######################################################################## 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 @@ -12,27 +12,27 @@ export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU, export PW_RT_MOUNT_RO=("") export PW_RT_MOUNT_RW=("/media" "/mnt" "/run/media/${USER}" "${PORT_WINE_PATH}") #export PW_SANDBOX_HOME_PATH="${PORT_WINE_PATH}" -export PW_NO_ESYNC=1 -export PW_USE_GAMEMODE=1 -export PW_FORCE_USE_VSYNC=2 -export PW_LOG=0 +export PW_NO_ESYNC="1" +export PW_USE_GAMEMODE="1" +export PW_FORCE_USE_VSYNC="2" +export PW_LOG="0" export PW_TERM="" -export PW_USE_TERMINAL=0 -export PW_WINEDBG_DISABLE=1 +export PW_USE_TERMINAL="0" +export PW_WINEDBG_DISABLE="1" export PW_WINDOWS_VER="10" export WINEARCH="win64" export PW_LIBS_VER="_v31" export PORTWINE_URL="https://portwine-linux.ru/" export GDK_BACKEND="x11" -export PW_USE_GSTREAMER=1 -export PW_USE_D3D_EXTRAS=1 +export PW_USE_GSTREAMER="1" +export PW_USE_D3D_EXTRAS="1" export PW_PREFIX_NAME="DEFAULT" export WINE_WIN_START="start.exe /i /unix" -export PW_USE_SHADER_CACHE=1 -export STAGING_SHARED_MEMORY=1 -export PW_FORCE_LARGE_ADDRESS_AWARE=1 +export PW_USE_SHADER_CACHE="1" +export STAGING_SHARED_MEMORY="1" +export PW_FORCE_LARGE_ADDRESS_AWARE="1" ###DEFAULT_WINE### -export PW_WINE_USE=PROTON_GE +export PW_WINE_USE="PROTON_GE" export PW_PLUGINS_VER="_v5" ###WINE_PROTON_STEAM### export PW_STEAM_VER="7.0-3" @@ -40,7 +40,7 @@ export PW_PROTON_STEAM_VER="PROTON_STEAM_${PW_STEAM_VER}" ###WINE_PROTON_GE### export PW_GE_VER="7-20" export PW_PROTON_GE_VER="PROTON_GE_${PW_GE_VER}" -export PW_WINE_FULLSCREEN_FSR=0 +export PW_WINE_FULLSCREEN_FSR="0" ###WINE_PROTON_PW_FOR_GALLIUM_NINE### export PW_PW_VER="7.5" export PW_PROTON_PW_VER="PROTON_PW_${PW_PW_VER}" @@ -49,10 +49,11 @@ pw_install_dll_in_prefix () { case $PW_PREFIX_NAME in DEFAULT) export PW_MUST_HAVE_DLL="physx mfc42 vcrun2019" ;; - DOTNET) export PW_MUST_HAVE_DLL="physx mfc42 vcrun2019 faudio dotnet48 dotnet20sp2" ;; + DOTNET) export PW_MUST_HAVE_DLL="physx mfc42 vcrun2019 faudio dotnet48" ;; *) export PW_MUST_HAVE_DLL="" ;; esac } +######################################################################## add_in_start_portwine () { echo " " diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui index da65c7ae..2a2524b6 100644 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -143,6 +143,7 @@ pw_tray_icon () { ${loc_tray_tascmng}!bash -c pw_tray_taskmgr!"$PW_GUI_ICON_PATH/port_winefile.png"|| \ ${loc_tray_cangelog}!bash -c open_changelog!"$PW_GUI_ICON_PATH/port_changelog.png"|| \ ${loc_tray_force_exit} !bash -c tray_icon_click_exit!"$PW_GUI_ICON_PATH/port_exit.png"||" & + return 0 }