diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog
index 731bb730..c6861c49 100644
--- a/data_from_portwine/changelog
+++ b/data_from_portwine/changelog
@@ -1,23 +1,66 @@
История изменений и дальнейшие планы:
-----------------------------------------
В планах:
-* зарабатывать на жизнь развитием проекта с помощью вашей подписки на https://boosty.to/portwine-linux.ru
+* добавть кнопку очистки префикса в PortProton
+* проверка версий и обновления скриптов из https://github.com/Castro-Fidel/PortWINE/archive/refs/heads/master.zip
* добавить условие: если установлен vcrun2019, то не устанавливать vcrun2015-2017
* EDIT DB открывается не у всех
-* добавить всю инфу из db файла и winetricks.log в debug
-* проверка установки mangohud
-* исправить работу windows steam
-* создать defaut префикс и сделать авто симлинки в другие префиксы (games, programm files, users)
-* добавить кнопку отчистки префикса без затрагивания игр и программ
-* удалить старые mono, gecko и libs из .PortWINE
-* добавить вопрос перед обновлением скриптов
* проверить windows steam под PortProton
-* убрать все *_vars
-* выкачка либов из серверов кроссовера?
+* создать defaut префикс и сделать авто симлинки в другие префиксы (games, programm files, users)
* иконка в трей для PortProton
* проверка версий dxvk на github: curl -s https://github.com/doitsujin/dxvk/releases | grep Version | awk {'print $3'} | sed 's%</a>%%g'
* проверка версий vkd3d на github: curl -s https://github.com/HansKristian-Work/vkd3d-proton/releases | grep Version | awk {'print $3'} | sed 's%</a>%%g'
+* зарабатывать на жизнь развитием проекта с помощью вашей подписки на https://boosty.to/portwine-linux.ru
-----------------------------------------
+###Scripts version 1045###
+* HOTFIX установка компонентов при отсутствии winetricks.log
+
+###Scripts version 1044###
+* переработано основное диалоговое окно при запуске PortProton и добавлена вкладка AUTOINSTALL
+* выбор debug снова есть при запуска с ярлыка PortProton
+* минимальный набор библиотек для установки с winetricks перенесен в default db
+* проверка уже установленных библиотек с помощью winetricks повторно не производится
+* после создания нового префикса, требование перезапуска порта больше нет
+* обновление префикса происходит в фоновом режиме
+* улучшена работа прогресс-бара
+
+###Scripts version 1043###
+* HOTFIX создания ярлыка (использование png вместо ico)
+
+###Scripts version 1042###
+* при запуске PortProton.desktop добавлена кнопка AUTOINSTALL
+* в AUTOINSTALL добавлена автоматическая установка WGC
+* исправлено отображение иконок на DE GNOME
+
+###Scripts version 1041###
+* wine-mono обновлен до версии 6.1.2
+
+###PortProton-75### 24.04.2021 ###Scripts version 1040###
+* обновлен wine Proton experimental 6.3 от 23.04.2021
+* добавлена функция pw_clear_pfx для отчистки префикса порта во время обновления без затрагивания игр и программ
+* проверка и настройка переменных для MANGOHUD добавлены функцию pw_mangohud_check
+* версия VKD3D по умолчанию = 2.3
+* добавлена поддержка DXR (RTX) в режиме VKD3D, при условии использования переменной PW_DXR_ON=1
+* переменная PW_DXR_ON добавлена в default db
+* переменная PW_DXVK_NO_ASYNC переименованна в PW_VULKAN_NO_ASYNC и теперь отключает асинхронные вызовы как в DXVK, так и в VKD3D
+
+###Scripts version 1039###
+* фикс выбора режима запуска (dxvk, vkd3d, opengl)
+
+###Scripts version 1038###
+* распаковка tar.xz вынесена в отдельную функцию unpack_tar_xz
+* добавлена проверка связи с серверами для автономной работы порта
+* ускорена работа reset скрипта останавливающая все процессы порта
+* исправлены ошибки связанные с остановкой отсутствующих pid-оф yad и процессов wine.
+* удалено использование wineserver -k в функции KILL_PORTWINE (влияло на инициализацию префикса)
+* добавлена отчистка ~/.PortWINE, при условии установки новой версии порта
+* добавлена вся информация из db файла и winetricks.log в debug
+* удален каталог vars (из за db файлоа больше в нем нет необходимости)
+* скрипт PortProton_vars перенесен в каталог scripts и переименован в var
+* добавлена проверка установки mangohud в систему
+* уменьшина ширина индикатора загрузки на 100px
+* улучшено определение необходимого db файла для запуска
+
###PortProton-74### 20.04.2021 ###Scripts version 1037###
* обновлен wine до версии Proton 6.3-2 next
* в setup db изменен список библиотек (фикс для "xatab") "vcrun6 mfc42 vcrun6sp6 mfc120 vcrun2013"
diff --git a/data_from_portwine/img/gui/wgc.png b/data_from_portwine/img/gui/wgc.png
new file mode 100644
index 00000000..6caf32b7
Binary files /dev/null and b/data_from_portwine/img/gui/wgc.png differ
diff --git a/data_from_portwine/scripts/autoinstall b/data_from_portwine/scripts/autoinstall
new file mode 100644
index 00000000..b48de2e2
--- /dev/null
+++ b/data_from_portwine/scripts/autoinstall
@@ -0,0 +1,24 @@
+#!/bin/bash
+# Author: Castro-Fidel (PortWINE-Linux.ru)
+########################################################################
+export PW_FORCE_DISABLED_GAMEMOD=0
+export PW_CHECK_AUTOINSTAL=1
+export PW_VULKAN_USE=0
+
+PW_WGC () {
+ export LAUNCH_PARAMETERS=("/SILENT" "/SP-")
+ [ "${update_loc}" = "RUS" ] && export WGC_LOC=RU || export WGC_LOC=EU
+ export PW_AUTOINSTALL_EXE="$WINEPREFIX/drive_c/Wargaming_Game_Center_Install_WoT_RU.exe"
+ START_PORTWINE
+ if try_download "https://redirect.wargaming.net/WGC/Wargaming_Game_Center_Install_WoT_${WGC_LOC}.exe" "${PW_AUTOINSTALL_EXE}"
+ then
+ PW_START_PROGRESS_BAR_CS "Starting WGC installation..."
+ PW_RUN "${PW_AUTOINSTALL_EXE}"
+ portwine_exe="$WINEPREFIX/drive_c/ProgramData/Wargaming.net/GameCenter/wgc.exe"
+ try_remove_file "${PW_AUTOINSTALL_EXE}"
+ KILL_PORTWINE
+ PORTWINE_CREATE_SHORTCUT
+ fi
+ STOP_PORTWINE
+}
+
diff --git a/data_from_portwine/scripts/portwine_db/ACIII b/data_from_portwine/scripts/portwine_db/ACIII
index 455f48fa..c407ebc1 100644
--- a/data_from_portwine/scripts/portwine_db/ACIII
+++ b/data_from_portwine/scripts/portwine_db/ACIII
@@ -14,7 +14,7 @@ export WINEDLLOVERRIDES="xinput1_3,d3dcompiler_43=n,b"
##export PW_LOG=0 # Enable debug mode fo terminal
##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
-##export PW_DXVK_NO_ASYNC=1 # Disabled ASYNC for VULKAN
+##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN
##export PW_USE_TERMINAL=0 # Force run in terminal
##export PW_OLD_GL_STRING=0
##export PW_NVAPI_DISABLE=1
diff --git a/data_from_portwine/scripts/portwine_db/Cyberpunk2077 b/data_from_portwine/scripts/portwine_db/Cyberpunk2077
index 243d4642..bdd65e0f 100644
--- a/data_from_portwine/scripts/portwine_db/Cyberpunk2077
+++ b/data_from_portwine/scripts/portwine_db/Cyberpunk2077
@@ -12,7 +12,7 @@ export WINEDLLOVERRIDES="Crash*,REDEngineErrorReporter.exe="
##export PW_LOG=0 # Enable debug mode fo terminal
##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
-##export PW_DXVK_NO_ASYNC=1 # Disabled ASYNC for VULKAN
+##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN
##export PW_USE_TERMINAL=0 # Force run in terminal
##export PW_OLD_GL_STRING=0
##export PW_NVAPI_DISABLE=1
diff --git a/data_from_portwine/scripts/portwine_db/DOOM Eternal b/data_from_portwine/scripts/portwine_db/DOOM Eternal
index 28b6510c..2ca0b7c3 100644
--- a/data_from_portwine/scripts/portwine_db/DOOM Eternal
+++ b/data_from_portwine/scripts/portwine_db/DOOM Eternal
@@ -8,7 +8,7 @@ export PW_VULKAN_USE=vkd3d
#export PW_LOG=0 # Enable debug mode fo terminal
#export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
-#export PW_DXVK_NO_ASYNC=1
+#export PW_VULKAN_NO_ASYNC=1
#export PW_USE_TERMINAL=1
#export PW_OLD_GL_STRING=0
#export PW_NVAPI_DISABLE=1
diff --git a/data_from_portwine/scripts/portwine_db/DetroitBecomeHuman b/data_from_portwine/scripts/portwine_db/DetroitBecomeHuman
index a4fa665a..8a61fdf4 100644
--- a/data_from_portwine/scripts/portwine_db/DetroitBecomeHuman
+++ b/data_from_portwine/scripts/portwine_db/DetroitBecomeHuman
@@ -6,4 +6,4 @@
export PW_VULKAN_USE=dxvk
export PW_FORCE_USE_VSYNC=0
export PW_WINDOWS_VER="10"
-export PW_VIRTUAL_DESKTOP=1
+#export PW_VIRTUAL_DESKTOP=1
diff --git a/data_from_portwine/scripts/portwine_db/Diablo_II b/data_from_portwine/scripts/portwine_db/Diablo_II
index 0a78f4fb..e866908a 100644
--- a/data_from_portwine/scripts/portwine_db/Diablo_II
+++ b/data_from_portwine/scripts/portwine_db/Diablo_II
@@ -11,7 +11,7 @@ export PW_VULKAN_USE=0
##export PW_LOG=0 # Enable debug mode fo terminal
##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
-##export PW_DXVK_NO_ASYNC=1 # Disabled ASYNC for VULKAN
+##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN
##export PW_USE_TERMINAL=0 # Force run in terminal
##export PW_OLD_GL_STRING=0
##export PW_NVAPI_DISABLE=1
diff --git a/data_from_portwine/scripts/portwine_db/FarLoneSails b/data_from_portwine/scripts/portwine_db/FarLoneSails
index 0be77cde..44673871 100644
--- a/data_from_portwine/scripts/portwine_db/FarLoneSails
+++ b/data_from_portwine/scripts/portwine_db/FarLoneSails
@@ -11,7 +11,7 @@
##export PW_LOG=0 # Enable debug mode fo terminal
##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
-##export PW_DXVK_NO_ASYNC=1 # Disabled ASYNC for VULKAN
+##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN
##export PW_USE_TERMINAL=0 # Force run in terminal
##export PW_OLD_GL_STRING=0
##export PW_NVAPI_DISABLE=1
diff --git a/data_from_portwine/scripts/portwine_db/Hades b/data_from_portwine/scripts/portwine_db/Hades
index 1b8ba29a..c5a9f9f1 100644
--- a/data_from_portwine/scripts/portwine_db/Hades
+++ b/data_from_portwine/scripts/portwine_db/Hades
@@ -9,7 +9,7 @@ export PW_VULKAN_USE=dxvk #dxvk or vkd3d
#export PW_LOG=0 # Enable debug mode fo terminal
#export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
#export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
-#export PW_DXVK_NO_ASYNC=1
+#export PW_VULKAN_NO_ASYNC=1
#export PW_USE_TERMINAL=0
#export PW_OLD_GL_STRING=0
#export PW_NVAPI_DISABLE=1
diff --git a/data_from_portwine/scripts/portwine_db/LOF2 b/data_from_portwine/scripts/portwine_db/LOF2
index 5d0d60b7..63316dbe 100644
--- a/data_from_portwine/scripts/portwine_db/LOF2
+++ b/data_from_portwine/scripts/portwine_db/LOF2
@@ -11,7 +11,7 @@ export PW_VULKAN_USE=dxvk
##export PW_LOG=0 # Enable debug mode fo terminal
##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
-##export PW_DXVK_NO_ASYNC=1 # Disabled ASYNC for VULKAN
+##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN
##export PW_USE_TERMINAL=0 # Force run in terminal
##export PW_OLD_GL_STRING=0
##export PW_NVAPI_DISABLE=1
diff --git a/data_from_portwine/scripts/portwine_db/League of Legends b/data_from_portwine/scripts/portwine_db/League of Legends
new file mode 100644
index 00000000..87bddaf4
--- /dev/null
+++ b/data_from_portwine/scripts/portwine_db/League of Legends
@@ -0,0 +1,15 @@
+export LAUNCH_PARAMETERS="--launch-product=league_of_legends --launch-patchline=live"
+cd "${PATH_TO_GAME}"
+
+if [ "$(cat /proc/sys/abi/vsyscall32)" -ne 0 ]
+then
+ zenity --question --title="Fix for LoL anti-cheat" \
+ --text='Root rights are required to execute the command: \n"sysctl -w abi.vsyscall32=0" and "sysctl -p"' --no-wrap
+ if [ "$?" = 1 ]
+ then
+ exit 0
+ fi
+ pkexec sh -c 'sysctl -w abi.vsyscall32=0 && sysctl -p'
+fi
+sh "${PORT_SCRIPTS_PATH}"/fix_start_lol.sh | zenity --progress --title="Start PortLoL" --text="Please wait, launch is in progress, it may take few minutes" --pulsate --auto-close --auto-kill --width=450 &
+}
\ No newline at end of file
diff --git a/data_from_portwine/scripts/portwine_db/LostEmber b/data_from_portwine/scripts/portwine_db/LostEmber
index 86ebdf9d..a810e294 100644
--- a/data_from_portwine/scripts/portwine_db/LostEmber
+++ b/data_from_portwine/scripts/portwine_db/LostEmber
@@ -12,7 +12,7 @@
##export PW_LOG=0 # Enable debug mode fo terminal
##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
-##export PW_DXVK_NO_ASYNC=1 # Disabled ASYNC for VULKAN
+##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN
##export PW_USE_TERMINAL=0 # Force run in terminal
##export PW_OLD_GL_STRING=0
export PW_NVAPI_DISABLE=1
diff --git a/data_from_portwine/scripts/portwine_db/MassEffect b/data_from_portwine/scripts/portwine_db/MassEffect
index 9527fc3f..ed4714ed 100644
--- a/data_from_portwine/scripts/portwine_db/MassEffect
+++ b/data_from_portwine/scripts/portwine_db/MassEffect
@@ -9,7 +9,7 @@ export PW_DLL_INSTALL="physx d3dx9" # Install DDL in port prefi
##export PW_LOG=0 # Enable debug mode fo terminal
##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
-##export PW_DXVK_NO_ASYNC=1 # Disabled ASYNC for VULKAN
+##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN
##export PW_USE_TERMINAL=0 # Force run in terminal
##export PW_OLD_GL_STRING=0
##export PW_NVAPI_DISABLE=1
diff --git a/data_from_portwine/scripts/portwine_db/MassEffect2 b/data_from_portwine/scripts/portwine_db/MassEffect2
index 69396cfd..b82a4311 100644
--- a/data_from_portwine/scripts/portwine_db/MassEffect2
+++ b/data_from_portwine/scripts/portwine_db/MassEffect2
@@ -9,7 +9,7 @@ export PW_DLL_INSTALL="physx d3dx9" # Install DDL in port prefi
##export PW_LOG=0 # Enable debug mode fo terminal
##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
-##export PW_DXVK_NO_ASYNC=1 # Disabled ASYNC for VULKAN
+##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN
##export PW_USE_TERMINAL=0 # Force run in terminal
##export PW_OLD_GL_STRING=0
##export PW_NVAPI_DISABLE=1
diff --git a/data_from_portwine/scripts/portwine_db/Need_For_Speed_The_Run b/data_from_portwine/scripts/portwine_db/Need_For_Speed_The_Run
index b857d611..80b62256 100644
--- a/data_from_portwine/scripts/portwine_db/Need_For_Speed_The_Run
+++ b/data_from_portwine/scripts/portwine_db/Need_For_Speed_The_Run
@@ -12,7 +12,7 @@
##export PW_LOG=0 # Enable debug mode fo terminal
##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
-##export PW_DXVK_NO_ASYNC=1 # Disabled ASYNC for VULKAN
+##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN
##export PW_USE_TERMINAL=0 # Force run in terminal
##export PW_OLD_GL_STRING=0
##export PW_NVAPI_DISABLE=1
diff --git a/data_from_portwine/scripts/portwine_db/Origin b/data_from_portwine/scripts/portwine_db/Origin
index 44e67816..5a7c8ad1 100644
--- a/data_from_portwine/scripts/portwine_db/Origin
+++ b/data_from_portwine/scripts/portwine_db/Origin
@@ -2,6 +2,49 @@
#Author: PortWINE
#Origin.exe
#Rating=?
-################################################
-export LAUNCH_PARAMETERS=""
-sed -i 's%key="EnableIgo" value="true"%key="EnableIgo" value="false"%g' "${WINEPREFIX}/drive_c/users/steamuser/Application Data/Origin/local_"*".xml"
+#####################examples###########################
+##export PW_COMMENT_DB="blablabla"
+
+##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP
+export PW_DLL_INSTALL="d3dcompiler_43 d3dcompiler_47 d3dx9" # Install DDL in port prefix (used winetricks)
+##export WINEDLLOVERRIDES="blabla=n,b"
+##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options
+
+##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL
+##export PW_DXVK_VER=1.8.1
+##export PW_VKD3D_VER=2.2
+##export PW_DXR_ON=1
+##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN
+export PW_NVAPI_DISABLE=1
+##export PW_OLD_GL_STRING=0
+##export PW_HIDE_NVIDIA_GPU=0
+##export PW_FORCE_USE_VSYNC=2 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
+##export PW_VKD3D_FEATURE_LEVEL=0
+##export PW_DXGI_FROM_DXVK=0
+##export PW_VIRTUAL_DESKTOP=1
+##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue
+
+##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
+##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
+
+##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games
+
+##export PW_FORCE_DISABLED_GAMEMOD=0 # Force disabele gamemod
+##export PW_FORCE_LARGE_ADDRESS_AWARE=1 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
+##export PW_NO_WRITE_WATCH=0 # 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 WINEARCH=win32 # defaut = win64
+##export WINEPREFIX=
+
+##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG
+##export PW_USE_TERMINAL=0 # Force run in terminal
+##export PW_LOG=0 # Enable debug mode fo terminal
+##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI
+
+export STAGING_SHARED_MEMORY=0
+
+ADD_IN_START_PORTWINE () {
+ sed -i 's%key="EnableIgo" value="true"%key="EnableIgo" value="false"%g' "${WINEPREFIX}/drive_c/users/steamuser/Application Data/Origin/local_"*".xml"
+}
+
diff --git a/data_from_portwine/scripts/portwine_db/Sirus Launcher b/data_from_portwine/scripts/portwine_db/Sirus Launcher
index 76cf66dc..0c50664c 100644
--- a/data_from_portwine/scripts/portwine_db/Sirus Launcher
+++ b/data_from_portwine/scripts/portwine_db/Sirus Launcher
@@ -12,7 +12,7 @@ export PW_WINDOWS_VER=7 # Set windows version 10, 7 or XP
##export PW_LOG=0 # Enable debug mode fo terminal
##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
-##export PW_DXVK_NO_ASYNC=1 # Disabled ASYNC for VULKAN
+##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN
##export PW_USE_TERMINAL=0 # Force run in terminal
##export PW_OLD_GL_STRING=0
##export PW_NVAPI_DISABLE=1
diff --git a/data_from_portwine/scripts/portwine_db/StarCraft b/data_from_portwine/scripts/portwine_db/StarCraft
index f2f7fd5a..589f9009 100644
--- a/data_from_portwine/scripts/portwine_db/StarCraft
+++ b/data_from_portwine/scripts/portwine_db/StarCraft
@@ -3,8 +3,6 @@
#StarCraft.exe
#Rating=1-5
################################################
- export PW_VULKAN_USE=dxvk
- #export PW_VIRTUAL_DESKTOP=1
export WINEDLLOVERRIDES="ddraw=n,b"
#####################examples###########################
##export PW_COMMENT_DB="blablabla"
@@ -14,7 +12,7 @@
##export PW_LOG=0 # Enable debug mode fo terminal
##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
-##export PW_DXVK_NO_ASYNC=1 # Disabled ASYNC for VULKAN
+##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN
##export PW_USE_TERMINAL=0 # Force run in terminal
##export PW_OLD_GL_STRING=0
##export PW_NVAPI_DISABLE=1
diff --git a/data_from_portwine/scripts/portwine_db/Suite b/data_from_portwine/scripts/portwine_db/Suite
index 880265ed..0781b637 100644
--- a/data_from_portwine/scripts/portwine_db/Suite
+++ b/data_from_portwine/scripts/portwine_db/Suite
@@ -9,7 +9,7 @@ export PW_DLL_INSTALL="corefonts" # Install DDL in port prefix (used wine
##export PW_LOG=0 # Enable debug mode fo terminal
##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
-##export PW_DXVK_NO_ASYNC=1 # Disabled ASYNC for VULKAN
+##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN
##export PW_USE_TERMINAL=0 # Force run in terminal
##export PW_OLD_GL_STRING=0
##export PW_NVAPI_DISABLE=1
diff --git a/data_from_portwine/scripts/portwine_db/UbisoftConnect b/data_from_portwine/scripts/portwine_db/UbisoftConnect
index a5cc783b..4cc98968 100644
--- a/data_from_portwine/scripts/portwine_db/UbisoftConnect
+++ b/data_from_portwine/scripts/portwine_db/UbisoftConnect
@@ -13,7 +13,7 @@
##export PW_LOG=0 # Enable debug mode fo terminal
##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
-##export PW_DXVK_NO_ASYNC=1 # Disabled ASYNC for VULKAN
+##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN
##export PW_USE_TERMINAL=0 # Force run in terminal
##export PW_OLD_GL_STRING=0
##export PW_NVAPI_DISABLE=1
diff --git a/data_from_portwine/scripts/portwine_db/WarGame3 b/data_from_portwine/scripts/portwine_db/WarGame3
index b65c671a..4909c456 100644
--- a/data_from_portwine/scripts/portwine_db/WarGame3
+++ b/data_from_portwine/scripts/portwine_db/WarGame3
@@ -12,7 +12,7 @@
##export PW_LOG=0 # Enable debug mode fo terminal
##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
-##export PW_DXVK_NO_ASYNC=1 # Disabled ASYNC for VULKAN
+##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN
##export PW_USE_TERMINAL=0 # Force run in terminal
##export PW_OLD_GL_STRING=0
##export PW_NVAPI_DISABLE=1
diff --git a/data_from_portwine/scripts/portwine_db/WorldOfTanksEnCoreLauncher b/data_from_portwine/scripts/portwine_db/WorldOfTanksEnCoreLauncher
deleted file mode 100644
index 9d570aca..00000000
--- a/data_from_portwine/scripts/portwine_db/WorldOfTanksEnCoreLauncher
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
- #Author: cefeiko
- #WorldOfTanksEnCoreLauncher.exe
- #Rating=1-5
- ################################################
- export PW_VULKAN_USE=dxvk
- export PW_USE_TERMINAL=0
- export WINEPREFIX="${PORT_WINE_PATH}/data/pfx_dotnet/"
- export PW_DLL_INSTALL="vcrun2017 vcrun6 mfc42 vb6run physx dotnet40 " # Install DDL in port prefix (used winetricks)
- export PW_COMMENT_DB="World Of Tanks EnCore"
- ## export DXVK_HUD=fps,devinfo
- ## export PW_MANGOHUD=1
-#####################examples###########################
-while [ `pidof -s dotNetFx40_Full_x86_x64.exe` ] ; do
- if [ $? -eq 0 ] ; then
- sleep 1
- elif
- export dotnet_pids=`ps -ax | grep mscorsvw.exe | awk '{print $1}' | uniq`
- [ ! -z $dotnet_pids ]
- kill -n 9 $dotnet_pids
- sleep 1
- fi
-done
diff --git a/data_from_portwine/scripts/portwine_db/alanwake b/data_from_portwine/scripts/portwine_db/alanwake
index 83bae384..cfdac2ee 100755
--- a/data_from_portwine/scripts/portwine_db/alanwake
+++ b/data_from_portwine/scripts/portwine_db/alanwake
@@ -10,7 +10,7 @@ export PW_DLL_INSTALL="d3dx9 d3dcompiler_43" # Install DDL in port prefix
##export PW_LOG=0 # Enable debug mode fo terminal
#export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
#export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
-##export PW_DXVK_NO_ASYNC=1 # Disabled ASYNC for VULKAN
+##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN
##export PW_USE_TERMINAL=0 # Force run in terminal
##export PW_OLD_GL_STRING=0
##export PW_NVAPI_DISABLE=1
diff --git a/data_from_portwine/scripts/portwine_db/arizona-starter b/data_from_portwine/scripts/portwine_db/arizona-starter
index 9fd7f154..3f841d63 100644
--- a/data_from_portwine/scripts/portwine_db/arizona-starter
+++ b/data_from_portwine/scripts/portwine_db/arizona-starter
@@ -11,7 +11,7 @@
##export PW_LOG=0 # Enable debug mode fo terminal
##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
-##export PW_DXVK_NO_ASYNC=1 # Disabled ASYNC for VULKAN
+##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN
##export PW_USE_TERMINAL=0 # Force run in terminal
##export PW_OLD_GL_STRING=0
##export PW_NVAPI_DISABLE=1
diff --git a/data_from_portwine/scripts/portwine_db/default b/data_from_portwine/scripts/portwine_db/default
index d96d7ceb..d68680ac 100644
--- a/data_from_portwine/scripts/portwine_db/default
+++ b/data_from_portwine/scripts/portwine_db/default
@@ -2,37 +2,47 @@
#Author: PortWINE-Linux.ru
#name_exe_file.exe
#Rating=1-5
-export PW_DLL_INSTALL="vcrun6 vcrun6sp6 mfc42 d3dcompiler_42 d3dcompiler_43 d3dcompiler_47 d3dx9" #Install DDL in port prefix (used winetricks)
#####################examples###########################
##export PW_COMMENT_DB="blablabla"
+
+##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP
+##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks)
+##export WINEDLLOVERRIDES="blabla=n,b"
+##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options
+
##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL
##export PW_DXVK_VER=1.8.1
##export PW_VKD3D_VER=2.2
-##export WINEDLLOVERRIDES="blabla=n,b"
-##export PW_DLL_INSTALL="vcrun2019 vcrun6" # Install DDL in port prefix (used winetricks)
-##export PW_LOG=0 # Enable debug mode fo terminal
-##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
-##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
-##export PW_DXVK_NO_ASYNC=1 # Disabled ASYNC for VULKAN
-##export PW_USE_TERMINAL=0 # Force run in terminal
-##export PW_OLD_GL_STRING=0
+##export PW_DXR_ON=1
+##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN
##export PW_NVAPI_DISABLE=1
-##export PW_VKD3D_FEATURE_LEVEL=0
-##export PW_NO_WRITE_WATCH=0 # 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_OLD_GL_STRING=0
##export PW_HIDE_NVIDIA_GPU=0
##export PW_FORCE_USE_VSYNC=2 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
-##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG
+##export PW_VKD3D_FEATURE_LEVEL=0
+##export PW_DXGI_FROM_DXVK=0
+##export PW_VIRTUAL_DESKTOP=1
+##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue
+##export ENABLE_VKBASALT=1
+
+##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
+##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
+
+##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games
+
##export PW_FORCE_DISABLED_GAMEMOD=0 # Force disabele gamemod
##export PW_FORCE_LARGE_ADDRESS_AWARE=1 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
-##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games
-##export LAUNCH_PARAMETERS="('"+com_skipIntroVideo 1"' '"+com_skipSignInManager 1"')" # Additional launch options
-##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI
-##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue,dxr
-##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP
-##export PW_VIRTUAL_DESKTOP=1
-##export DXVK_HUD=fps,devinfo
+##export PW_NO_WRITE_WATCH=0 # 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_DXGI_FROM_DXVK=0
+
##export WINEARCH=win32 # defaut = win64
##export WINEPREFIX=
+
+##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG
+##export PW_USE_TERMINAL=0 # Force run in terminal
+##export PW_LOG=0 # Enable debug mode fo terminal
+##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI
+
##ADD_IN_START_PORTWINE () { commands ; }
+
+export PW_DLL_INSTALL="vcrun6 vcrun6sp6 mfc42 d3dcompiler_42 d3dcompiler_43 d3dcompiler_47 d3dx9"
diff --git a/data_from_portwine/scripts/portwine_db/dontstarve b/data_from_portwine/scripts/portwine_db/dontstarve
index 9539890e..7be27739 100644
--- a/data_from_portwine/scripts/portwine_db/dontstarve
+++ b/data_from_portwine/scripts/portwine_db/dontstarve
@@ -3,7 +3,7 @@
#dontstarve.exe
#Rating=1-5
################################################
- export PW_VULKAN_USE=vkd3d
+ export PW_VULKAN_USE=0
#####################examples###########################
##export PW_COMMENT_DB="blablabla"
##export PW_VULKAN_USE=dxvk # dxvk, vkd3d or 0 for OpenGL
@@ -12,7 +12,7 @@
##export PW_LOG=0 # Enable debug mode fo terminal
##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
-##export PW_DXVK_NO_ASYNC=1 # Disabled ASYNC for VULKAN
+##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN
##export PW_USE_TERMINAL=0 # Force run in terminal
##export PW_OLD_GL_STRING=0
##export PW_NVAPI_DISABLE=1
diff --git a/data_from_portwine/scripts/portwine_db/risen-1 b/data_from_portwine/scripts/portwine_db/risen-1
index ef0cb3a4..70691758 100644
--- a/data_from_portwine/scripts/portwine_db/risen-1
+++ b/data_from_portwine/scripts/portwine_db/risen-1
@@ -9,7 +9,7 @@ export PW_DLL_INSTALL="physx d3dx9" # Install DDL in port prefix (used wi
##export PW_LOG=0 # Enable debug mode fo terminal
##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
-##export PW_DXVK_NO_ASYNC=1 # Disabled ASYNC for VULKAN
+##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN
##export PW_USE_TERMINAL=0 # Force run in terminal
##export PW_OLD_GL_STRING=0
##export PW_NVAPI_DISABLE=1
diff --git a/data_from_portwine/scripts/portwine_db/setup b/data_from_portwine/scripts/portwine_db/setup
index c3d5f2ee..29fb2dd9 100644
--- a/data_from_portwine/scripts/portwine_db/setup
+++ b/data_from_portwine/scripts/portwine_db/setup
@@ -12,19 +12,19 @@ export PW_VULKAN_USE=0 #dxvk or vkd3d
#export PW_LOG=0 # Enable debug mode fo terminal
export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
-#export PW_DXVK_NO_ASYNC=1
+#export PW_VULKAN_NO_ASYNC=1
#export PW_USE_TERMINAL=0
#export PW_OLD_GL_STRING=0
#export PW_NVAPI_DISABLE=1
#export PW_VKD3D_FEATURE_LEVEL=0
-#export PW_NO_WRITE_WATCH=0 # 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_NO_WRITE_WATCH=0 # 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_HIDE_NVIDIA_GPU=0
#export PW_FORCE_USE_VSYNC=2 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
-#export PW_WINEDBG_DISABLE=1
+export PW_WINEDBG_DISABLE=1
export PW_FORCE_DISABLED_GAMEMOD=1 # Force disabele gamemod
-#export PW_FORCE_LARGE_ADDRESS_AWARE=0 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
+export PW_FORCE_LARGE_ADDRESS_AWARE=0 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
#export PULSE_LATENCY_MSEC=60
-export PW_DLL_INSTALL="vcrun6 mfc42 vcrun6sp6 mfc120 vcrun2013"
+export PW_DLL_INSTALL="vcrun6 mfc42 vcrun6sp6 mfc120 vcrun2013"
#export LAUNCH_PARAMETERS="-d3d9"
export PW_GUI_DISABLED_CS=1
-#export PW_WINDOWS_VER=XP # Set windows version 10, 7 or XP
+#export PW_WINDOWS_VER=XP # Set windows version 10, 7 or XP
\ No newline at end of file
diff --git a/data_from_portwine/scripts/portwine_db/wgc b/data_from_portwine/scripts/portwine_db/wgc
index 055724a6..ff65a89c 100644
--- a/data_from_portwine/scripts/portwine_db/wgc
+++ b/data_from_portwine/scripts/portwine_db/wgc
@@ -4,9 +4,14 @@
#Rating=5
################################################
export PW_VULKAN_USE=dxvk #dxvk, vkd3d or 0 for OpenGL
-#export PW_DLL_INSTALL="" # Install DDL in port prefix (used winetricks)
export LAUNCH_PARAMETERS="--disable-gpu" # Additional launch options
export PW_USE_TERMINAL=1
+export PW_WINDOWS_VER=7 # Set windows version 10, 7 or XP
+export PW_NVAPI_DISABLE=1
+export WINEDLLOVERRIDES="ucrtbase=b,n"
+##export PW_GUI_DISABLED_CS=1
+
ADD_IN_START_PORTWINE () {
- sed -i 's/true/false/g' "${PORT_WINE_PATH}/data/pfx/drive_c/Games/WGC/preferences.xml"
-}
\ No newline at end of file
+ sed -i 's/true/false/g' "$WINEPREFIX/drive_c/ProgramData/Wargaming.net/GameCenter/preferences.xml"
+}
+
\ No newline at end of file
diff --git a/data_from_portwine/scripts/portwine_db/wotblitz b/data_from_portwine/scripts/portwine_db/wotblitz
index 45f153aa..03c02f6f 100644
--- a/data_from_portwine/scripts/portwine_db/wotblitz
+++ b/data_from_portwine/scripts/portwine_db/wotblitz
@@ -12,7 +12,7 @@ export PW_DLL_INSTALL="vcrun2013 vcrun2017 dotnet472"
##export PW_LOG=0 # Enable debug mode fo terminal
##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
##export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
-##export PW_DXVK_NO_ASYNC=1 # Disabled ASYNC for VULKAN
+##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN
##export PW_USE_TERMINAL=0 # Force run in terminal
##export PW_OLD_GL_STRING=0
##export PW_NVAPI_DISABLE=1
diff --git a/data_from_portwine/scripts/reset b/data_from_portwine/scripts/reset
index ecbb0a72..d8fdee7c 100755
--- a/data_from_portwine/scripts/reset
+++ b/data_from_portwine/scripts/reset
@@ -5,5 +5,3 @@ KILL_PORTWINE
if [ -e "${PORT_WINE_TMP_PATH}/pw_vulkan" ]; then
rm -f "${PORT_WINE_TMP_PATH}/pw_vulkan"
fi
-START_PORTWINE
-STOP_PORTWINE | sszen
diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib
index 249823f5..83900426 100755
--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@@ -1,6 +1,6 @@
#!/bin/bash
# Author: Castro-Fidel (PortWINE-Linux.ru)
-# Development assistants: Cefeiko; Rus_Nor; gavr; RidBowt;
+# Development assistants: Cefeiko; Rus_Nor; gavr; RidBowt; Dezert1r
########################################################################
echo '
████─████─████─███─█───█─███─█──█─███
@@ -15,19 +15,10 @@ if [ "${s_install}" != "1" ] && [ ! -x "`which "zenity" 2>/dev/null`" ];then
echo "You will need to install: zenity, and restart the port."
xdg-open "http://portwine-linux.ru/portwine-faq/" > /dev/null 2>&1 & exit 0
fi
-pw_default_vars () {
- export pw_libs_ver="_v9"
- export mono_ver=6.1.1
- export gecko_ver=2.47.2
- export PW_DXVK_VER=1.8.1
- export PW_VKD3D_VER=2.2
-
- export PW_LOG=0
- export PW_TERM=""
- export WINEARCH="win64"
- export PW_WINDOWS_VER="7"
- export PW_FORCE_LARGE_ADDRESS_AWARE=1
-}
+pw_ping_test () {
+ ping -w1 -c1 github.com &> /dev/null
+ [ "$?" == "0" ] && return 0 || return 1
+}
print_error () {
echo "ERROR: $@"
}
@@ -93,7 +84,7 @@ try_download () {
wget -c -t 3 -T 2 "$1" --output-document="$2" 2>&1 | \
sed -u 's/^[a-zA-Z\-].*//; s/.* \{1,2\}\([0-9]\{1,3\}\)%.*/\1\n#Downloading... \1%/; s/^20[0-9][0-9].*/#Done./' | \
zenity --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." && export DOWNLOAD_ERROR=1 && return 1 || export DOWNLOAD_ERROR=0 && return 0
+ [ "${PIPESTATUS[0]}" != 0 ] && print_error "failed to download $1. Scipping." && return 1 || return 0
}
create_new_dir () {
if [ ! -d "$1" ] ; then
@@ -106,27 +97,68 @@ var_winedlloverride_update () {
else export WINEDLLOVERRIDES="${1}"
fi
}
+var_vkd3d_config_update () {
+ if [ ! -z "${VKD3D_CONFIG}" ]
+ then export VKD3D_CONFIG="${1};${VKD3D_CONFIG}"
+ else export VKD3D_CONFIG="${1}"
+ fi
+}
+unpack_tar_xz () {
+ set -o pipefail
+ tar -Jxvf "$1" -C "$2" | sszen
+ [ "${PIPESTATUS[0]}" != 0 ] && print_error "File unpacking error." && return 1 || return 0
+}
+#pw_restart () {
+# exit 0 &
+# /bin/bash -C $pw_full_start_command
+#}
+pw_mangohud_check () {
+ export RUN_MANGOHUD=""
+ export MANGOHUD=0
+ export MANGOHUD_DLSYM=0
+ if [ -x "`which mangohud 2>/dev/null`" ] && [ "${PW_MANGOHUD}" == "1" ] ; then
+ if [ "${PW_VULKAN_USE}" = "0" ]; then
+ export MANGOHUD_DLSYM=1
+ export RUN_MANGOHUD=mangohud
+ else
+ export MANGOHUD=1
+ fi
+ fi
+}
+pw_clear_pfx () {
+ try_remove_file "${WINEPREFIX}/system.reg"
+ try_remove_file "${WINEPREFIX}/user.reg"
+ try_remove_file "${WINEPREFIX}/userdef.reg"
+ try_remove_file "${WINEPREFIX}/winetricks.log"
+ try_remove_dir "${WINEPREFIX}/drive_c/windows/"
+}
sszen() {
zenity --progress --title="Settings..." --text="Updating parameters" --pulsate --auto-close --width=500 --height=90 --no-cancel
}
-PW_START_PROGRESS_BAR () {
- "${pw_yad}" --progress --progress-text="Start ${portname}... Please wait..." --pulsate --close-on-unfocus \
- --no-buttons --undecorated --center --skip-taskbar --width=600 --wrap-width=500 &
- export start_progress_yad_pid=$(echo $!)
+PW_START_PROGRESS_BAR_CS () {
+ "${pw_yad}" --progress --progress-text="$@" --pulsate --close-on-unfocus \
+ --no-buttons --undecorated --center --skip-taskbar --width=500 --wrap-width=500 &
+ echo ""
+}
+PW_START_PROGRESS_BAR_BLOK () {
+ "${pw_yad}" --progress --progress-text="$@" --pulsate \
+ --no-buttons --undecorated --center --skip-taskbar --width=500 --wrap-width=500 &
+ echo ""
}
PW_STOP_PROGRESS_BAR () {
- if [ ! -z "${start_progress_yad_pid}" ] ; then
- kill "${start_progress_yad_pid}"
- fi
+ while [ ! -z "`pgrep -a yad | grep "\-\-progress" | awk '{print $1}'`" ]
+ do kill -9 [ "`pgrep -a yad | grep "\-\-progress" | awk '{print $1}'`" ]
+ done
}
cd "$(dirname "`readlink -f "$0"`")" && export PORT_SCRIPTS_PATH="$(pwd)"
cd "${PORT_SCRIPTS_PATH}/../../" && export PORT_WINE_PATH="$(pwd)"
export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp"
read "portname" < "${PORT_WINE_TMP_PATH}/portname" && export portname
cd "${PORT_SCRIPTS_PATH}"
-. "${PORT_SCRIPTS_PATH}/vars/${portname}_vars"
+. "${PORT_SCRIPTS_PATH}/var"
create_new_dir "${PORT_WINE_TMP_PATH}"
create_new_dir "${HOME}/.PortWINE/tmp"
+try_remove_dir "${PORT_SCRIPTS_PATH}/vars"
if [ ! -e "${PORT_WINE_TMP_PATH}/${portname}_loc" ]; then
SET_LANG=`zenity --title "Install $portname" --text "Select the language" --list --radiolist \
@@ -135,17 +167,13 @@ if [ ! -e "${PORT_WINE_TMP_PATH}/${portname}_loc" ]; then
FALSE "ENG" `
echo "${SET_LANG}" > "${PORT_WINE_TMP_PATH}/${portname}_loc"
fi
-if [ "${portname}" = "PortProton" ]; then
- if [ -e "${PORT_WINE_TMP_PATH}/pw_vulkan" ]; then
- rm -f "${PORT_WINE_TMP_PATH}/pw_vulkan"
- fi
-fi
+
. "${PORT_SCRIPTS_PATH}"/lang
+
if [ ! -e "${PORT_WINE_TMP_PATH}/${portname}_ver" ]; then
echo "10" > "${PORT_WINE_TMP_PATH}/${portname}_ver"
fi
-pw_default_vars
var_winedlloverride_update "winemenubuilder.exe="
export url_mono="https://github.com/madewokherd/wine-mono/releases/download/wine-mono-${mono_ver}/wine-mono-${mono_ver}-x86.tar.xz"
export url_gecko_x86="https://dl.winehq.org/wine/wine-gecko/${gecko_ver}/wine-gecko-${gecko_ver}-x86.tar.xz"
@@ -159,15 +187,27 @@ export PW_COMPAT_MEDIA_PATH="${PORT_WINE_TMP_PATH}"
export PW_RUNTIME="$WINELIB/run.sh"
export PW_GUI_ICON_PATH="${PORT_WINE_PATH}/data/img/gui"
export PW_VULKAN_DLL="${HOME}/.PortWINE/vulkan"
-
+export PW_DXVK_VER="${PW_DEF_DXVK_VER}"
+export PW_VKD3D_VER="${PW_DEF_VKD3D_VER}"
+export install_ver=`cat "${PORT_WINE_TMP_PATH}/${portname}_ver" | head -n 1`
+export scripts_install_ver=`cat "${PORT_WINE_TMP_PATH}/scripts_ver" | head -n 1`
if [ -z "${INSTALLING_PORT}" ] ; then
if [ ! -e "${WINELIB}/run.sh" ] || [ ! -e "${WINELIB}/usr/bin/yad" ] || [ ! -e "${WINELIB}/amd64/usr/bin/vkcube" ] || [ ! -e "${WINELIB}/amd64/usr/bin/xterm" ] || [ -e "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz" ] ; then
- echo "Download and install libraries..."
- try_download "https://github.com/Castro-Fidel/PortWINE/releases/download/libs${pw_libs_ver}/libs${pw_libs_ver}.tar.xz" "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz"
- [ "${DOWNLOAD_ERROR}" != 1 ] && tar -Jxvf "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz" -C "${HOME}/.PortWINE/" | sszen &&
- [ "${DOWNLOAD_ERROR}" != 1 ] && rm -f "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz"
- #[ "${DOWNLOAD_ERROR}" != 1 ] && "${WINELIB}"/setup.sh --force
+ print_info "Download and install libraries..."
+ if try_download "https://github.com/Castro-Fidel/PortWINE/releases/download/libs${pw_libs_ver}/libs${pw_libs_ver}.tar.xz" "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz" ; then
+ if unpack_tar_xz "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz" "${HOME}/.PortWINE/" ; then
+ try_remove_file "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz"
+ else
+ try_remove_dir "${HOME}/.PortWINE/libs${pw_libs_ver}"
+ try_remove_file "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz"
+ `zenity --error --title "Error..." --text "Failed to download runtime libraries.\nCheck internet connection and restart PortProton" --no-wrap ` > /dev/null 2>&1
+ exit 0
+ fi
+ else
+ `zenity --error --title "Error..." --text "Failed to download runtime libraries.\nCheck internet connection and restart PortProton" --no-wrap ` > /dev/null 2>&1
+ exit 1
+ fi
fi
if [ -e "${WINELIB}/run.sh" ]; then
echo "######################################################"
@@ -188,41 +228,48 @@ if [ -z "${INSTALLING_PORT}" ] ; then
fi
if [ ! -d "${HOME}/.PortWINE/mono/wine-mono-${mono_ver}" ] ; then
echo "######################################################"
- echo "Download and install wine mono..."
- try_download "${url_mono}" "${HOME}/.PortWINE/tmp/wine-mono-${mono_ver}-x86.tar.xz"
- [ "${DOWNLOAD_ERROR}" != 1 ] && create_new_dir "${HOME}/.PortWINE/mono"
- [ "${DOWNLOAD_ERROR}" != 1 ] && tar -Jxvf "${HOME}/.PortWINE/tmp/wine-mono-${mono_ver}-x86.tar.xz" -C "${HOME}/.PortWINE/mono/" | sszen &&
- [ "${DOWNLOAD_ERROR}" != 1 ] && try_remove_file "${HOME}/.PortWINE/tmp/wine-mono-${mono_ver}-x86.tar.xz"
+ print_info "Download and install wine mono..."
+ if try_download "${url_mono}" "${HOME}/.PortWINE/tmp/wine-mono-${mono_ver}-x86.tar.xz" ; then
+ create_new_dir "${HOME}/.PortWINE/mono"
+ if ! unpack_tar_xz "${HOME}/.PortWINE/tmp/wine-mono-${mono_ver}-x86.tar.xz" "${HOME}/.PortWINE/mono/"
+ then try_remove_dir "${HOME}/.PortWINE/mono/wine-mono-${mono_ver}-x86"
+ fi
+ try_remove_file "${HOME}/.PortWINE/tmp/wine-mono-${mono_ver}-x86.tar.xz"
+ fi
fi
if [ ! -d "${HOME}/.PortWINE/gecko/wine-gecko-${gecko_ver}-x86" ] ; then
echo "######################################################"
echo "Download and install wine gecko x86..."
- try_download "${url_gecko_x86}" "${HOME}/.PortWINE/tmp/wine-gecko-${gecko_ver}-x86.tar.xz"
- [ "${DOWNLOAD_ERROR}" != 1 ] && create_new_dir "${HOME}/.PortWINE/gecko"
- [ "${DOWNLOAD_ERROR}" != 1 ] && tar -Jxvf "${HOME}/.PortWINE/tmp/wine-gecko-${gecko_ver}-x86.tar.xz" -C "${HOME}/.PortWINE/gecko/" | sszen &&
- [ "${DOWNLOAD_ERROR}" != 1 ] && try_remove_file "${HOME}/.PortWINE/tmp/wine-gecko-${gecko_ver}-x86.tar.xz"
+ if try_download "${url_gecko_x86}" "${HOME}/.PortWINE/tmp/wine-gecko-${gecko_ver}-x86.tar.xz" ; then
+ create_new_dir "${HOME}/.PortWINE/gecko"
+ if ! unpack_tar_xz "${HOME}/.PortWINE/tmp/wine-gecko-${gecko_ver}-x86.tar.xz" "${HOME}/.PortWINE/gecko/"
+ then try_remove_dir "${HOME}/.PortWINE/gecko/wine-gecko-${gecko_ver}-x86"
+ fi
+ try_remove_file "${HOME}/.PortWINE/tmp/wine-gecko-${gecko_ver}-x86.tar.xz"
+ fi
fi
if [ ! -d "${HOME}/.PortWINE/gecko/wine-gecko-${gecko_ver}-x86_64" ] ; then
echo "######################################################"
echo "Download and install wine gecko x86_64..."
- try_download "${url_gecko_x86_64}" "${HOME}/.PortWINE/tmp/wine-gecko-${gecko_ver}-x86_64.tar.xz"
- [ "${DOWNLOAD_ERROR}" != 1 ] && create_new_dir "${HOME}/.PortWINE/gecko"
- [ "${DOWNLOAD_ERROR}" != 1 ] && tar -Jxvf "${HOME}/.PortWINE/tmp/wine-gecko-${gecko_ver}-x86_64.tar.xz" -C "${HOME}/.PortWINE/gecko/" | sszen &&
- [ "${DOWNLOAD_ERROR}" != 1 ] && try_remove_file "${HOME}/.PortWINE/tmp/wine-gecko-${gecko_ver}-x86_64.tar.xz"
+ if try_download "${url_gecko_x86_64}" "${HOME}/.PortWINE/tmp/wine-gecko-${gecko_ver}-x86_64.tar.xz" ; then
+ create_new_dir "${HOME}/.PortWINE/gecko"
+ if ! unpack_tar_xz "${HOME}/.PortWINE/tmp/wine-gecko-${gecko_ver}-x86_64.tar.xz" "${HOME}/.PortWINE/gecko/"
+ then try_remove_dir "${HOME}/.PortWINE/gecko/wine-gecko-${gecko_ver}-x86_64"
+ fi
+ try_remove_file "${HOME}/.PortWINE/tmp/wine-gecko-${gecko_ver}-x86_64.tar.xz"
+ fi
fi
create_new_dir "${WINEDIR}/share/wine/"
try_force_link_dir "${HOME}/.PortWINE/gecko" "${WINEDIR}"/share/wine/
try_force_link_dir "${HOME}/.PortWINE/mono" "${WINEDIR}"/share/wine/
- if [ ! -z "${gamestart}" ]; then
- export PORTWINE_DB=`echo "${gamestart}" | awk -F '/' 'NF>1{print $NF}' | sed s/".exe"/""/gi`
- elif [ ! -z "${portwine_exe}" ]; then
+ if [ ! -z "${portwine_exe}" ]; then
export PORTWINE_DB=`echo "${portwine_exe}" | awk -F '/' 'NF>1{print $NF}' | sed s/".exe"/""/gi`
export PATH_TO_GAME="$( cd "$( dirname "${portwine_exe}" )" >/dev/null 2>&1 && pwd )"
export WIN_PATH_TO_GAME=`echo "C:${PATH_TO_GAME}" | sed "s%$WINEPREFIX%%g" | sed "s/drive_c//g" | sed 's#/#\\\#g'`
fi
if [ ! -z "${PORTWINE_DB}" ]; then
- PORTWINE_DB_FILE=`grep -il "#${PORTWINE_DB}" "${PORT_SCRIPTS_PATH}/portwine_db"/* | sed s/".exe"/""/gi`
+ PORTWINE_DB_FILE=`grep -ilw "#${PORTWINE_DB}" "${PORT_SCRIPTS_PATH}/portwine_db"/* | sed s/".exe"/""/gi`
if [ ! -z "${PORTWINE_DB_FILE}" ]; then
. "${PORTWINE_DB_FILE}"
echo "Use ${PORTWINE_DB_FILE} db file."
@@ -234,106 +281,52 @@ if [ -z "${INSTALLING_PORT}" ] ; then
fi
START_PORTWINE ()
{
- if [ -x "`which konsole 2>/dev/null`" ]; then
- export PW_TERM="konsole --nofork -e"
- elif [ -x "`which xterm 2>/dev/null`" ]; then
- export PW_TERM="${PW_XTERM}"
- elif [ -x "`which gnome-terminal 2>/dev/null`" ]; then
- export PW_TERM="gnome-terminal -- $SHELL -c"
- elif [ -x "`which lxterminal 2>/dev/null`" ]; then
- export PW_TERM="lxterminal -e"
- else
- export PW_TERM="${PW_XTERM}"
- fi
- if [ -z "${INSTALLING_PORT}" ] ; then
- PW_UPDATE
- fi
- if [ ! -z "${PW_VULKAN_USE}" ]; then
- export var_pw_vulkan="${PW_VULKAN_USE}"
- echo "${var_pw_vulkan}" > "${PORT_WINE_TMP_PATH}/pw_vulkan"
- else
- read "var_pw_vulkan" < "${PORT_WINE_TMP_PATH}/pw_vulkan" && export var_pw_vulkan
+ if [ -x "`which konsole 2>/dev/null`" ]; then export PW_TERM="konsole --nofork -e"
+ elif [ -x "`which xterm 2>/dev/null`" ]; then export PW_TERM="${PW_XTERM}"
+ elif [ -x "`which gnome-terminal 2>/dev/null`" ]; then export PW_TERM="gnome-terminal -- $SHELL -c"
+ elif [ -x "`which lxterminal 2>/dev/null`" ]; then export PW_TERM="lxterminal -e"
+ else export PW_TERM="${PW_XTERM}"
fi
+ [ -z "${INSTALLING_PORT}" ] && PW_UPDATE
+
try_remove_dir "${PORT_WINE_PATH}/data/vulkan"
create_new_dir "${PW_VULKAN_DLL}"
export url_dxvk="https://github.com/doitsujin/dxvk/releases/download/v${PW_DXVK_VER}/dxvk-${PW_DXVK_VER}.tar.gz"
if [ ! -d "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}" ] ; then
- try_download "${url_dxvk}" "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}.tar.gz"
- [ "${DOWNLOAD_ERROR}" != 1 ] && tar -zxvf "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}.tar.gz" -C "${PW_VULKAN_DLL}/"
- try_remove_file "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}.tar.gz"
- if [ "${DOWNLOAD_ERROR}" != 0 ] ; then
- `zenity --error --title "Error..." --text "You will need to change DXVK version in db file!" --no-wrap ` > /dev/null 2>&1
- PW_EDIT_DB & exit 1
+ if pw_ping_test ; then
+ if try_download "${url_dxvk}" "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}.tar.gz" ; then
+ tar -zxvf "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}.tar.gz" -C "${PW_VULKAN_DLL}/"
+ try_remove_file "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}.tar.gz"
+ else
+ try_remove_file "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}.tar.gz"
+ `zenity --error --title "Error..." --text "You will need to change DXVK version in db file!" --no-wrap ` > /dev/null 2>&1
+ PW_EDIT_DB & exit 1
+ fi
+ else
+ export PW_DXVK_VER="${PW_DEF_DXVK_VER}"
fi
fi
export url_vkd3d="https://github.com/HansKristian-Work/vkd3d-proton/releases/download/v${PW_VKD3D_VER}/vkd3d-proton-${PW_VKD3D_VER}.tar.zst"
if [ ! -d "${PW_VULKAN_DLL}/vkd3d-proton-${PW_VKD3D_VER}" ] ; then
- try_download "${url_vkd3d}" "${PW_VULKAN_DLL}/vkd3d-proton-${PW_VKD3D_VER}.tar.zst"
- [ "${DOWNLOAD_ERROR}" != 1 ] && tar -C "${PW_VULKAN_DLL}/" -I "${pw_zstd}" -xvf "${PW_VULKAN_DLL}/vkd3d-proton-${PW_VKD3D_VER}.tar.zst"
- try_remove_file "${PW_VULKAN_DLL}/vkd3d-proton-${PW_VKD3D_VER}.tar.zst"
- if [ "${DOWNLOAD_ERROR}" != 0 ] ; then
- `zenity --error --title "Error..." --text "You will need to change VKD3D version in db file!" --no-wrap ` > /dev/null 2>&1
- PW_EDIT_DB & exit 1
- fi
- fi
-
- PW_START_PROGRESS_BAR
-
- if [ "${var_pw_vulkan}" = "0" ]; then
- export MESA_GLSL_CACHE_DIR="${PORT_WINE_TMP_PATH}"
- export GL_NO_DSO_FINALIZER=1
- export GL_YIELD="NOTHING"
- export GL_SHARPEN_IGNORE_FILM_GRAIN=0
- export GL_SHARPEN_ENABLE=1
- export __GL_SHARPEN_VALUE=0
- for wine_build_dll in d3d11 d3d10 d3d10core d3d10_1 d3d9 ; do
- try_copy_file "${WINEDIR}/lib/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
- try_copy_file "${WINEDIR}/lib64/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/"
- done
- try_copy_file "${WINEDIR}"/lib/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/syswow64/"
- try_copy_file "${WINEDIR}"/lib64/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/"
- var_winedlloverride_update "dxgi=b;d3d12="
- [ "${PW_MANGOHUD}" == "1" ] && export MANGOHUD_DLSYM=1
- echo "Use OpenGL"
- elif [ "${var_pw_vulkan}" = "dxvk" ]; then
- for wine_dxvk_dll in d3d11 d3d10 d3d10core d3d10_1 d3d9 dxgi ; do
- try_copy_file "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}/x32/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
- try_copy_file "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}/x64/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/"
- [ "$?" == 0 ] && var_winedlloverride_update "${wine_dxvk_dll}=n"
- done
- #var_winedlloverride_update "d3d12="
- [ "${PW_MANGOHUD}" == "1" ] && export MANGOHUD=1
- echo "Use DXVK version ${PW_DXVK_VER} (DX9-DX11 to Vulkan)"
- else
- for wine_vkd3d_dll in d3d12 ; do
- try_copy_file "${PW_VULKAN_DLL}/vkd3d-proton-${PW_VKD3D_VER}/x86/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
- try_copy_file "${PW_VULKAN_DLL}/vkd3d-proton-${PW_VKD3D_VER}/x64/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/"
- [ "$?" == 0 ] && var_winedlloverride_update "${wine_vkd3d_dll}=n"
- done
- if [ ! -z "${PW_DXGI_FROM_DXVK}" ] && [ "${PW_DXGI_FROM_DXVK}" != 0 ] ; then
-
- for wine_dxvk_dll in d3d11 d3d10 d3d10core d3d10_1 d3d9 dxgi ; do
- try_copy_file "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}/x32/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
- try_copy_file "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}/x64/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/"
- var_winedlloverride_update "${wine_dxvk_dll}=n"
- done
+ if pw_ping_test ; then
+ if try_download "${url_vkd3d}" "${PW_VULKAN_DLL}/vkd3d-proton-${PW_VKD3D_VER}.tar.zst" ; then
+ tar -C "${PW_VULKAN_DLL}/" -I "${pw_zstd}" -xvf "${PW_VULKAN_DLL}/vkd3d-proton-${PW_VKD3D_VER}.tar.zst"
+ try_remove_file "${PW_VULKAN_DLL}/vkd3d-proton-${PW_VKD3D_VER}.tar.zst"
+ else
+ try_remove_file "${PW_VULKAN_DLL}/vkd3d-proton-${PW_VKD3D_VER}.tar.zst"
+ `zenity --error --title "Error..." --text "You will need to change VKD3D version in db file!" --no-wrap ` > /dev/null 2>&1
+ PW_EDIT_DB & exit 1
+ fi
else
- try_copy_file "${WINEDIR}/lib/wine/fakedlls/dxgi.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
- try_copy_file "${WINEDIR}/lib64/wine/fakedlls/dxgi.dll" "${WINEPREFIX}/drive_c/windows/system32/"
- var_winedlloverride_update "dxgi=b"
- for wine_build_dll in d3d11 d3d10 d3d10core d3d10_1 d3d9 ; do
- try_copy_file "${WINEDIR}/lib/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
- try_copy_file "${WINEDIR}/lib64/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/"
- done
+ export PW_VKD3D_VER="${PW_DEF_VKD3D_VER}"
fi
- [ "${PW_MANGOHUD}" == "1" ] && export MANGOHUD=1
- export PW_WINDOWS_VER="10"
- echo "Use VKD3D-PROTON version ${PW_VKD3D_VER} (DX12 to vulkan)"
fi
+ PW_START_PROGRESS_BAR_CS "Start ${portname}... Please wait..."
+
export WINELOADER="${WINEDIR}/bin/wine"
export WINEDLLPATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine:${PATH_TO_GAME}"
export WINESERVER="${WINEDIR}/bin/wineserver"
@@ -386,8 +379,9 @@ START_PORTWINE ()
if [ ! -z "${PW_NO_WRITE_WATCH}" ] && [ "${PW_NO_WRITE_WATCH}" != 0 ] ; then
export WINE_DISABLE_WRITE_WATCH="1"
fi
- if [ ! -z "${PW_DXVK_NO_ASYNC}" ] && [ "${PW_DXVK_NO_ASYNC}" != 0 ] ; then
+ if [ ! -z "${PW_VULKAN_NO_ASYNC}" ] && [ "${PW_VULKAN_NO_ASYNC}" != 0 ] ; then
export RADV_DEBUG="llvm"
+ var_vkd3d_config_update single_queue
fi
if [ ! -z "${PW_NVAPI_DISABLE}" ] && [ "${PW_NVAPI_DISABLE}" != 0 ] ; then
var_winedlloverride_update "nvapi,nvapi64="
@@ -404,6 +398,9 @@ START_PORTWINE ()
if [ ! -z "${PW_HEAP_DELAY_FREE}" ] && [ "${PW_HEAP_DELAY_FREE}" != 0 ] ; then
export WINE_HEAP_DELAY_FREE="1"
fi
+ if [ ! -z "${PW_DXR_ON}" ] && [ "${PW_DXR_ON}" != 0 ] ; then
+ var_vkd3d_config_update dxr
+ fi
create_new_dir "${PORT_WINE_TMP_PATH}/dxvk_cache"
export DXVK_STATE_CACHE_PATH="${PORT_WINE_TMP_PATH}"/dxvk_cache
export DXVK_STATE_CACHE=1
@@ -477,10 +474,13 @@ WAIT_WINESERVER () {
}
KILL_PORTWINE () {
- wine_pids=$(ls -l /proc/*/exe 2>/dev/null | grep -ie ${portname} | grep -E 'wine(64)?-preloader|wineserver' | awk -F/ '{print $3}')
+ wine_pids=`ls -l /proc/*/exe 2>/dev/null | grep -ie ${portname} | grep -E 'wine(64)?-preloader| ' | awk -F/ '{print $3}'`
if [ ! -z "${wine_pids}" ] ; then
- "${WINESERVER}" -k
- kill -9 ${wine_pids}
+ for pw_kill_pids in ${wine_pids} ; do
+ if [ "`ps cax | grep ${pw_kill_pids}`" ] ; then
+ kill -n 9 ${pw_kill_pids}
+ fi
+ done
fi
}
@@ -494,6 +494,8 @@ STOP_PORTWINE () {
setxkbmap ${PW_XKBD}
fi
PW_STOP_PROGRESS_BAR
+ try_remove_file "${PORT_SCRIPTS_PATH}/0"
+ try_remove_file "${PORT_SCRIPTS_PATH}/1"
}
UPDATE_WINETRICKS () {
@@ -507,10 +509,11 @@ UPDATE_WINETRICKS () {
W_TRX_INT_VER="$(cat "${PORT_WINE_TMP_PATH}/winetricks" | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')"
print_info "Version winetricks in port: ${W_TRX_INT_VER}"
if [ "$W_TRX_INT_VER" != "$W_TRX_EXT_VER" ] ; then
- try_download "${W_TRX_URL}" "${PORT_WINE_TMP_PATH}/winetricks_new"
- [ "$DOWNLOAD_ERROR" != "1" ] && mv -f "${PORT_WINE_TMP_PATH}/winetricks_new" "${PORT_WINE_TMP_PATH}/winetricks"
- [ "$DOWNLOAD_ERROR" != "1" ] && W_TRX_INT_VER="$(cat "${PORT_WINE_TMP_PATH}/winetricks" | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')" && print_info "Winetricks version in port has been updated (${W_TRX_INT_VER})"
- chmod u+x "${PORT_WINE_TMP_PATH}/winetricks"
+ if try_download "${W_TRX_URL}" "${PORT_WINE_TMP_PATH}/winetricks_new" ; then
+ mv -f "${PORT_WINE_TMP_PATH}/winetricks_new" "${PORT_WINE_TMP_PATH}/winetricks"
+ W_TRX_INT_VER="$(cat "${PORT_WINE_TMP_PATH}/winetricks" | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')" && print_info "Winetricks version in port has been updated (${W_TRX_INT_VER})"
+ chmod u+x "${PORT_WINE_TMP_PATH}/winetricks"
+ fi
fi
fi
}
@@ -519,25 +522,30 @@ RUN_WINETRICKS_FROM_DB () {
UPDATE_WINETRICKS
if [ ! -z "${PW_DLL_INSTALL}" ]; then
PW_STOP_PROGRESS_BAR
+ export PW_DLL_NEED_INSTALL=""
export USE_WT_FROM_DB=0
if [ -e "${WINEPREFIX}/winetricks.log" ] ; then
for need_install_dll_to_pfx in ${PW_DLL_INSTALL} ; do
grep "${need_install_dll_to_pfx}" "${WINEPREFIX}/winetricks.log"
if [ "$?" == "1" ] ; then
+ if [ -z "${PW_DLL_NEED_INSTALL}" ]
+ then export PW_DLL_NEED_INSTALL="${need_install_dll_to_pfx}"
+ else export PW_DLL_NEED_INSTALL="${need_install_dll_to_pfx} ${PW_DLL_NEED_INSTALL}"
+ fi
export USE_WT_FROM_DB=1
- break
fi
done
else
- export USE_WT_FROM_DB=1
+ export PW_DLL_NEED_INSTALL="${PW_DLL_INSTALL}"
+ export USE_WT_FROM_DB=1
fi
if [ "${USE_WT_FROM_DB}" == "1" ] ; then
UPDATE_WINETRICKS
PW_STOP_PROGRESS_BAR
- ${PW_TERM} "${PW_RUNTIME}" "${PORT_WINE_TMP_PATH}/winetricks" -q ${PW_DLL_INSTALL}
- PW_START_PROGRESS_BAR
+ print_info "Need to install DLL in prefix: ${PW_DLL_NEED_INSTALL}"
+ ${PW_TERM} "${PW_RUNTIME}" "${PORT_WINE_TMP_PATH}/winetricks" -q --force ${PW_DLL_NEED_INSTALL}
fi
- PW_START_PROGRESS_BAR
+ PW_START_PROGRESS_BAR_CS "Start ${portname}... Please wait..."
fi
if [[ -z `cat "${WINEPREFIX}/system.reg" | grep "Windows $PW_WINDOWS_VER"` ]] ; then
if [ ! -z "${PW_WINDOWS_VER}" ] && [ `echo "$PW_WINDOWS_VER" | sed 's/.*/\L&/'` == "xp" ] ; then
@@ -560,7 +568,6 @@ PW_UPDATE () {
echo `curl -s --list-only "${PW_FTP_URL}/current_version/${portname}_ver"` > "${PORT_WINE_TMP_PATH}/${portname}_cur_ver"
if [ -f "${PORT_WINE_TMP_PATH}/${portname}_ver" ] ; then
read current_ver < "${PORT_WINE_TMP_PATH}/${portname}_cur_ver"
- read install_ver < "${PORT_WINE_TMP_PATH}/${portname}_ver"
try_remove_file "${PORT_WINE_TMP_PATH}/${portname}_cur_ver"
if [ ! -z "${current_ver}" ] && [ "${current_ver}" -gt "${install_ver}" ] ; then
xsd=`zenity --title "${port_upd1}" --text "${port_upd2}" --list --radiolist --height=220 --column="${inst_set}" --column "${port_upd3}" \
@@ -569,7 +576,7 @@ PW_UPDATE () {
FALSE "${port_upd6}" `
case $xsd in
"${port_upd4}")
- "${WINESERVER}" -k
+ KILL_PORTWINE
xdg-open $porturl
exit 0 ;;
"${port_upd5}")
@@ -620,9 +627,10 @@ PW_INIT_PFX () {
sed -i '/HKCR,steam\\shell\\open\\command/d' "${WINEDIR}"*/share/wine/wine.inf
sed -i '/HKCR,steam\\shell\\open\\command/d' "${WINEDIR}"*/share/wine/wine.inf
PW_STOP_PROGRESS_BAR
- ${PW_TERM} "${PW_RUNTIME}" "${WINELOADER}" wineboot -u
- `zenity --info --title "Info..." --text " Updating prefix completed successfully.\n\n Restart ${portname}." --no-wrap ` > /dev/null 2>&1
- exit 0
+ PW_START_PROGRESS_BAR_BLOK "Updating prefix... Please wait..."
+ "${PW_RUNTIME}" "${WINELOADER}" wineboot -u
+ PW_STOP_PROGRESS_BAR
+ PW_START_PROGRESS_BAR_CS "Initialization prefix..."
fi
rm -f "${WINEPREFIX}/drive_c/windows/system32"/steam*
rm -f "${WINEPREFIX}/drive_c/windows/syswow64"/steam*
@@ -639,6 +647,58 @@ PW_INIT_PFX () {
var_winedlloverride_update "steam_api,steam_api64,steamclient,steamclient64=n"
#sed -i '/steamclient/d' "${WINEPREFIX}"/*.reg
#sed -i '/SteamPath/d' "${WINEPREFIX}"/*.reg
+
+ export TOTAL_VRAM=`"${WINELIB}/amd64/usr/bin/glxinfo" -B | grep Total | awk -F: '{print $2}' | awk '{print $1}'`
+ echo "TOTAL_VRAM=${TOTAL_VRAM}"
+
+ if [ "${PW_VULKAN_USE}" = "0" ]; then
+ export MESA_GLSL_CACHE_DIR="${PORT_WINE_TMP_PATH}"
+ export GL_NO_DSO_FINALIZER=1
+ export GL_YIELD="NOTHING"
+ export GL_SHARPEN_IGNORE_FILM_GRAIN=0
+ export GL_SHARPEN_ENABLE=1
+ export __GL_SHARPEN_VALUE=0
+ for wine_build_dll in d3d11 d3d10 d3d10core d3d10_1 d3d9 ; do
+ try_copy_file "${WINEDIR}/lib/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
+ try_copy_file "${WINEDIR}/lib64/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/"
+ done
+ try_copy_file "${WINEDIR}"/lib/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/syswow64/"
+ try_copy_file "${WINEDIR}"/lib64/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/"
+ var_winedlloverride_update "dxgi=b;d3d12="
+ echo "Use OpenGL"
+ elif [ "${PW_VULKAN_USE}" = "dxvk" ]; then
+ for wine_dxvk_dll in d3d11 d3d10 d3d10core d3d10_1 d3d9 dxgi ; do
+ try_copy_file "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}/x32/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
+ try_copy_file "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}/x64/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/"
+ [ "$?" == 0 ] && var_winedlloverride_update "${wine_dxvk_dll}=n"
+ done
+ #var_winedlloverride_update "d3d12="
+ echo "Use DXVK version ${PW_DXVK_VER} (DX9-DX11 to Vulkan)"
+ else
+ for wine_vkd3d_dll in d3d12 ; do
+ try_copy_file "${PW_VULKAN_DLL}/vkd3d-proton-${PW_VKD3D_VER}/x86/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
+ try_copy_file "${PW_VULKAN_DLL}/vkd3d-proton-${PW_VKD3D_VER}/x64/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/"
+ [ "$?" == 0 ] && var_winedlloverride_update "${wine_vkd3d_dll}=n"
+ done
+ if [ ! -z "${PW_DXGI_FROM_DXVK}" ] && [ "${PW_DXGI_FROM_DXVK}" != 0 ] ; then
+
+ for wine_dxvk_dll in d3d11 d3d10 d3d10core d3d10_1 d3d9 dxgi ; do
+ try_copy_file "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}/x32/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
+ try_copy_file "${PW_VULKAN_DLL}/dxvk-${PW_DXVK_VER}/x64/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/"
+ var_winedlloverride_update "${wine_dxvk_dll}=n"
+ done
+ else
+ try_copy_file "${WINEDIR}/lib/wine/fakedlls/dxgi.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
+ try_copy_file "${WINEDIR}/lib64/wine/fakedlls/dxgi.dll" "${WINEPREFIX}/drive_c/windows/system32/"
+ var_winedlloverride_update "dxgi=b"
+ for wine_build_dll in d3d11 d3d10 d3d10core d3d10_1 d3d9 ; do
+ try_copy_file "${WINEDIR}/lib/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/"
+ try_copy_file "${WINEDIR}/lib64/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/"
+ done
+ fi
+ export PW_WINDOWS_VER="10"
+ echo "Use VKD3D-PROTON version ${PW_VKD3D_VER} (DX12 to vulkan)"
+ fi
}
PW_SCRIPTS_UPDATE () {
@@ -648,7 +708,6 @@ PW_SCRIPTS_UPDATE () {
echo `curl -s --list-only "${PW_FTP_URL}/current_version/scripts_ver"` > "${PORT_WINE_TMP_PATH}/scripts_cur_ver"
if [ "$?" == "0" ] ; then
read scripts_current_ver < "${PORT_WINE_TMP_PATH}/scripts_cur_ver"
- read scripts_install_ver < "${PORT_WINE_TMP_PATH}/scripts_ver"
try_remove_file "${PORT_WINE_TMP_PATH}/scripts_cur_ver"
if [ ! -z "${scripts_current_ver}" ] && [ "${scripts_current_ver}" -gt "${scripts_install_ver}" ] ; then
echo "######################################################"
@@ -673,9 +732,8 @@ PW_RUN () {
else
cd "${WINEPREFIX}/drive_c"
fi
- export RUN_MANGOHUD=""
- [ "${PW_MANGOHUD}" == "1" ] && export RUN_MANGOHUD=mangohud
- print_var "WINEDIR" "WINEARCH" "WINEPREFIX" "WINEDLLOVERRIDES" "PATH_TO_GAME"
+ pw_mangohud_check
+ print_var "WINEDIR" "WINEARCH" "WINEPREFIX" "WINEDLLOVERRIDES" "PATH_TO_GAME" "PW_VULKAN_USE" "VKD3D_CONFIG"
if [ "${PW_LOG}" == 1 ] ; then
export PW_TERM=""
export PW_LOG_TO_FILE="${PORT_WINE_PATH}/${portname}.log"
diff --git a/data_from_portwine/scripts/setup.sh b/data_from_portwine/scripts/setup.sh
index 0e78b699..6a6916ee 100755
--- a/data_from_portwine/scripts/setup.sh
+++ b/data_from_portwine/scripts/setup.sh
@@ -16,35 +16,24 @@ try_remove_file "${PORT_WINE_PATH}/restart.desktop"
try_remove_dir "${PORT_WINE_PATH}/data/pfx/dosdevices"
try_remove_dir "${PORT_WINE_PATH}/Settings"
+try_remove_dir "$HOME/.PortWINE"
create_new_dir "/home/${USER}/.local/share/applications"
-if ! [ "${portname}" = "PortProton" ]; then
- name_desktop="${gamename}"
- echo "[Desktop Entry]" > "${PORT_WINE_PATH}/${name_desktop}.desktop"
- echo "Name=${name_desktop}" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
- echo "Exec=env "${PORT_SCRIPTS_PATH}/start.sh"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
- echo "Type=Application" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
- echo "Categories=Game" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
- echo "StartupNotify=true" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
- echo "Path="${PORT_SCRIPTS_PATH}/"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
- echo "Icon="${PORT_WINE_PATH}/data/img/w.png"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
- chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop"
- cp -f "${PORT_WINE_PATH}/${name_desktop}.desktop" /home/${USER}/.local/share/applications/
-else
- name_desktop="PortProton"
- echo "[Desktop Entry]" > "${PORT_WINE_PATH}/${name_desktop}.desktop"
- echo "Name=${name_desktop}" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
- echo "Exec=env "${PORT_SCRIPTS_PATH}/start.sh %U"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
- echo "Type=Application" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
- echo "Categories=Game" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
- echo "StartupNotify=true" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
- echo "MimeType=application/x-ms-dos-executable;application/x-wine-extension-msp;application/x-msi;application/x-msdos-program" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
- echo "Path="${PORT_SCRIPTS_PATH}/"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
- echo "Icon="${PORT_WINE_PATH}/data/img/w.png"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
- chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop"
- cp -f "${PORT_WINE_PATH}/${name_desktop}.desktop" /home/${USER}/.local/share/applications/
-fi
+name_desktop="PortProton"
+echo "[Desktop Entry]" > "${PORT_WINE_PATH}/${name_desktop}.desktop"
+echo "Name=${name_desktop}" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+echo "Exec=env "${PORT_SCRIPTS_PATH}/start.sh %U"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+echo "Type=Application" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+echo "Categories=Game" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+echo "StartupNotify=true" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+echo "MimeType=application/x-ms-dos-executable;application/x-wine-extension-msp;application/x-msi;application/x-msdos-program" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+echo "Path="${PORT_SCRIPTS_PATH}/"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+echo "Icon="${PORT_WINE_PATH}/data/img/w.png"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop"
+cp -f "${PORT_WINE_PATH}/${name_desktop}.desktop" /home/${USER}/.local/share/applications/
+
+update-desktop-database -q "${HOME}/.local/share/applications"
name_desktop="readme"
echo "[Desktop Entry]" > "${PORT_WINE_PATH}/${name_desktop}.desktop"
@@ -78,14 +67,10 @@ elif [ -L "${PORT_WINE_PATH}/data/pfx/drive_c/users/Public" ]; then
rm -fr "${PORT_WINE_PATH}/data/pfx/drive_c/users/Public"
fi
ln -s "${PORT_WINE_PATH}/data/pfx/drive_c/users/steamuser" "${PORT_WINE_PATH}/data/pfx/drive_c/users/Public"
-
if [ ! -d "${PORT_WINE_PATH}/data/pfx/drive_c/users/${USER}" ]; then
ln -s "${PORT_WINE_PATH}/data/pfx/drive_c/users/steamuser" "${PORT_WINE_PATH}/data/pfx/drive_c/users/${USER}"
fi
-if [ -e "${PORT_WINE_PATH}/data/pfx/system.reg" ] || [ -e "${PORT_WINE_PATH}/data/pfx/user.reg" ] || [ -e "${PORT_WINE_PATH}/data/pfx/userdef.reg" ]; then
- sed -i "s/xuser/${USER}/g" "${PORT_WINE_PATH}/data/pfx/"*.reg
- sed -i "s/vagrant/${USER}/g" "${PORT_WINE_PATH}/data/pfx/"*.reg
-fi
+pw_clear_pfx
if [ "${s_install}" = "1" ]; then
echo "Installation completed successfully."
else
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index 3565cfd7..95d2de36 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -22,10 +22,8 @@ PORTWINE_LAUNCH () {
PW_RUN explorer "$portwine_exe"
elif [ ! -z "${portwine_exe}" ]; then
PW_RUN "$portwine_exe"
- elif [ -z "${gamestart}" ]; then
+ else
PW_RUN explorer
- else
- PW_RUN "${gamestart}"
fi
}
PORTWINE_CREATE_SHORTCUT () {
@@ -41,37 +39,43 @@ PORTWINE_CREATE_SHORTCUT () {
if [ -x "`which wrestool 2>/dev/null`" ]; then
wrestool -x --output="${PORTPROTON_PATH}/" -t14 "${PORTPROTON_EXE}"
cp "$(ls -S -1 "${PORTPROTON_EXE}"*".ico" | head -n 1)" "${PORTPROTON_EXE}.ico"
- cp -f "${PORTPROTON_EXE}.ico" "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.ico"
+ icotool -x --output="${PORTPROTON_PATH}/" "${PORTPROTON_EXE}.ico"
+ cp "$(ls -S -1 "${PORTPROTON_EXE}"*".png" | head -n 1)" "${PORTPROTON_EXE}.png"
+ cp -f "${PORTPROTON_EXE}.png" "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png"
rm -f "${PORTPROTON_PATH}/"*.ico
+ rm -f "${PORTPROTON_PATH}/"*.png
fi
if [ $? -eq 1 ] ; then exit 1 ; fi
- export PW_VULKAN_TO_DB=`cat "${PORT_WINE_TMP_PATH}/pw_vulkan"`
if [ ! -z "${PORTWINE_DB}" ]; then
PORTWINE_DB_FILE=`grep -il "\#${PORTWINE_DB}.exe" "${PORT_SCRIPTS_PATH}/portwine_db"/*`
if [ ! -z "${PORTWINE_DB_FILE}" ] && [ -z "${PW_VULKAN_USE}" ]; then
- echo "export PW_VULKAN_USE=${PW_VULKAN_TO_DB}" >> "${PORTWINE_DB_FILE}"
+ echo "export PW_VULKAN_USE=${PW_VULKAN_USE}" >> "${PORTWINE_DB_FILE}"
elif [ -z "${PORTWINE_DB_FILE}" ]; then
echo "#!/bin/bash
#Author: "${USER}"
#"${PORTWINE_DB}.exe"
#Rating=1-5
################################################
- export PW_VULKAN_USE=${PW_VULKAN_TO_DB}" > "${PORT_SCRIPTS_PATH}/portwine_db/$PORTWINE_DB"
+ export PW_VULKAN_USE=${PW_VULKAN_USE}" > "${PORT_SCRIPTS_PATH}/portwine_db/$PORTWINE_DB"
cat "${PORT_SCRIPTS_PATH}/portwine_db/default" | grep "##" >> "${PORT_SCRIPTS_PATH}/portwine_db/$PORTWINE_DB"
fi
fi
name_desktop="${PORTPROTON_NAME}"
echo "[Desktop Entry]" > "${PORT_WINE_PATH}/${name_desktop}.desktop"
echo "Name=${PORTPROTON_NAME}" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
- echo "Exec=env PW_GUI_DISABLED_CS=1 "\"${PORT_SCRIPTS_PATH}/start.sh\" \"${PORTPROTON_EXE}\" "" \
+ if [ -z "${PW_CHECK_AUTOINSTAL}" ]
+ then echo "Exec=env PW_GUI_DISABLED_CS=1 "\"${PORT_SCRIPTS_PATH}/start.sh\" \"${PORTPROTON_EXE}\" "" \
>> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+ else echo "Exec=env "\"${PORT_SCRIPTS_PATH}/start.sh\" \"${PORTPROTON_EXE}\" "" \
+ >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+ fi
echo "Type=Application" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
echo "Categories=Game" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
echo "StartupNotify=true" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
echo "Path="${PORT_SCRIPTS_PATH}/"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
- echo "Icon="${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.ico"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+ echo "Icon="${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop"
- `zenity --question --title "${inst_set}." --text "${ss_done}" --no-wrap ` > /dev/null 2>&1
+ `zenity --question --title "${inst_set}." --text "${ss_done}" --no-wrap ` &> /dev/null
if [ $? -eq "0" ]; then
cp -f "${PORT_WINE_PATH}/${name_desktop}.desktop" /home/${USER}/.local/share/applications/
fi
@@ -97,7 +101,10 @@ PORTWINE_DEBUG () {
echo "GLIBC version:" >> "${PORT_WINE_PATH}/${portname}.log"
echo `ldd --version | grep -m1 ldd | awk '{print $NF}'` >> "${PORT_WINE_PATH}/${portname}.log"
echo "--------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
- echo "var_pw_vulkan = ${var_pw_vulkan}" >> "${PORT_WINE_PATH}/${portname}.log"
+ if [ "${PW_VULKAN_USE}" = "0" ]; then echo "PW_VULKAN_USE=${PW_VULKAN_USE} - DX9-11 to OpenGL" >> "${PORT_WINE_PATH}/${portname}.log"
+ elif [ "${PW_VULKAN_USE}" = "dxvk" ]; then echo "PW_VULKAN_USE=${PW_VULKAN_USE}_v."${PW_DXVK_VER}"" >> "${PORT_WINE_PATH}/${portname}.log"
+ else echo "PW_VULKAN_USE=${PW_VULKAN_USE}_v."${PW_VKD3D_VER}"" >> "${PORT_WINE_PATH}/${portname}.log"
+ fi
echo "------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
echo "Date and time of start debug for ${portname}" >> "${PORT_WINE_PATH}/${portname}.log"
date >> "${PORT_WINE_PATH}/${portname}.log"
@@ -132,20 +139,32 @@ PORTWINE_DEBUG () {
else
echo "Vkcube test completed with error" >> "${PORT_WINE_PATH}/${portname}.log"
fi
- echo "---------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
if [ ! -x "`which gamemoderun 2>/dev/null`" ]
then
+ echo "---------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
echo "!!!gamemod not found!!!" >> "${PORT_WINE_PATH}/${portname}.log"
fi
echo "--------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
echo "Version WINE in the Port" >> "${PORT_WINE_PATH}/${portname}.log"
"$WINELOADER" --version 2>&1 | tee -a "${PORT_WINE_PATH}/${portname}.log"
echo "-------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
- echo "log WINE:" >> "${PORT_WINE_PATH}/${portname}.log"
+ echo "winetricks.log:" >> "${PORT_WINE_PATH}/${portname}.log"
+ cat "${WINEPREFIX}/winetricks.log" >> "${PORT_WINE_PATH}/${portname}.log"
+ echo "------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
+ if [ ! -z "${PORTWINE_DB_FILE}" ]; then
+ echo "Use ${PORTWINE_DB_FILE} db file:" >> "${PORT_WINE_PATH}/${portname}.log"
+ cat "${PORTWINE_DB_FILE}" | sed '/##/d' | awk '{print $1 " " $2}' >> "${PORT_WINE_PATH}/${portname}.log"
+ else
+ echo "Use ${PORT_SCRIPTS_PATH}/portwine_db/default db file:" >> "${PORT_WINE_PATH}/${portname}.log"
+ cat "${PORT_SCRIPTS_PATH}/portwine_db/default" | sed '/##/d' | awk '{print $1 " " $2}' >> "${PORT_WINE_PATH}/${portname}.log"
+ fi
+ echo "-----------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
+ echo "Log WINE:" >> "${PORT_WINE_PATH}/${portname}.log"
export DXVK_HUD="full"
- PORTWINE_LAUNCH & zenity --info --title "DEBUG" --text "${port_debug}" --no-wrap && KILL_PORTWINE
+ PORTWINE_LAUNCH &
+ sleep 1 && zenity --info --title "DEBUG" --text "${port_debug}" --no-wrap &> /dev/null && KILL_PORTWINE
deb_text=$(cat "${PORT_WINE_PATH}/${portname}.log" | awk '! a[$0]++')
echo "$deb_text" > "${PORT_WINE_PATH}/${portname}.log"
xdg-open "${PORT_WINE_PATH}/${portname}.log"
@@ -176,6 +195,12 @@ PW_WINETRICKS () {
PW_EDIT_DB () {
xdg-open "${PORTWINE_DB_FILE}"
}
+PW_AUTO_INSTALL_FROM_DB () {
+ . "$PORT_SCRIPTS_PATH/autoinstall"
+ $PW_YAD_SET
+}
+
+
if [ ! -z "${portwine_exe}" ]; then
if [ -z "${PW_GUI_DISABLED_CS}" ] || [ "${PW_GUI_DISABLED_CS}" = 0 ] ; then
if [ ! -z "${PORTWINE_DB_FILE}" ] && [ ! -z "${PW_VULKAN_USE}" ]; then
@@ -184,10 +209,11 @@ if [ ! -z "${portwine_exe}" ]; then
fi
OUTPUT_START=$("${pw_yad}" --text-align=center --text "$PW_COMMENT_DB" --wrap-width=150 --borders=15 --form --center \
--title "$portname" --image "$PW_GUI_ICON_PATH/port_proton.png" --separator=";" \
+ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \
--button='EDIT DB'!!"${loc_edit_db} ${PORTWINE_DB}":118 \
--button='CREATE SHORTCUT'!!"${loc_creat_shortcut}":100 \
--button='DEBUG'!!"${loc_debug}":102 \
- --button='LAUNCH'!!"${loc_launch}":106 )
+ --button='LAUNCH'!!"${loc_launch}":106 &> /dev/null )
PW_YAD_SET="$?"
elif [ ! -z "${PORTWINE_DB_FILE}" ] && [ -z "${PW_VULKAN_USE}" ]; then
if [ -z "${PW_COMMENT_DB}" ] ; then
@@ -195,19 +221,21 @@ if [ ! -z "${portwine_exe}" ]; then
fi
OUTPUT_START=$("${pw_yad}" --text-align=center --text "$PW_COMMENT_DB" --wrap-width=150 --borders=15 --form --center \
--title "$portname" --image "$PW_GUI_ICON_PATH/port_proton.png" --separator=";" \
+ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \
--field="WINE:CB" "DXVK"!"VKD3D"!"OPENGL" \
--button='EDIT DB'!!"${loc_edit_db} ${PORTWINE_DB}":118 \
--button='CREATE SHORTCUT'!!"${loc_creat_shortcut}":100 \
--button='DEBUG'!!"${loc_debug}":102 \
- --button='LAUNCH'!!"${loc_launch}":106 )
+ --button='LAUNCH'!!"${loc_launch}":106 &> /dev/null )
PW_YAD_SET="$?"
else
OUTPUT_START=$("${pw_yad}" --wrap-width=250 --borders=15 --form --center \
--title "$portname" --image "$PW_GUI_ICON_PATH/port_proton.png" --separator=";" \
+ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \
--field="WINE:CB" "DXVK"!"VKD3D"!"OPENGL" \
--button='CREATE SHORTCUT'!!"${loc_creat_shortcut}":100 \
--button='DEBUG'!!"${loc_debug}":102 \
- --button='LAUNCH'!!"${loc_launch}":106 )
+ --button='LAUNCH'!!"${loc_launch}":106 &> /dev/null )
PW_YAD_SET="$?"
fi
elif [ ! -z "${PORTWINE_DB_FILE}" ]; then
@@ -215,42 +243,69 @@ if [ ! -z "${portwine_exe}" ]; then
else
OUTPUT_START=$("${pw_yad}" --wrap-width=250 --borders=15 --form --center \
--title "$portname" --image "$PW_GUI_ICON_PATH/port_proton.png" --separator=";" \
+ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \
--field="WINE:CB" "DXVK"!"VKD3D"!"OPENGL" \
--button='CREATE SHORTCUT'!!"${loc_creat_shortcut}":100 \
--button='DEBUG'!!"${loc_debug}":102 \
- --button='LAUNCH'!!"${loc_launch}":106 )
+ --button='LAUNCH'!!"${loc_launch}":106 &> /dev/null )
PW_YAD_SET="$?"
fi
else
- OUTPUT_START=$("${pw_yad}" --wrap-width=250 --borders=15 --form --center \
- --title "$portname" --image "$PW_GUI_ICON_PATH/port_proton.png" --separator=";" \
- --field="WINE:CB" "DXVK"!"VKD3D"!"OPENGL" \
- --button='DEBUG'!!"${loc_debug}":102 \
- --button='WINECFG'!!"${loc_winecfg}":108 \
- --button='WINEFILE'!!"${loc_winefile}":110 \
- --button='WINECMD'!!"${loc_winecmd}":112 \
- --button='WINEREG'!!"${loc_winereg}":114 \
- --button='WINETRICKS'!!"${loc_winetricks}":116 )
- PW_YAD_SET="$?"
+ button_click () {
+ echo "$1" > "${PORT_WINE_TMP_PATH}/tmp_yad_form"
+ if [ ! -z `pidof -s yad` ] ; then
+ kill -s SIGUSR1 `pgrep -a yad | grep "\-\-key=${KEY} \-\-notebook" | awk '{print $1}'`
+ fi
+ }
+ export -f button_click
+ export KEY=$RANDOM
+
+ "${pw_yad}" --plug=$KEY --tabnum=2 --form --columns=2 --scroll \
+ --field=" Wargaming Game Center"!"$PW_GUI_ICON_PATH/wgc.png":"BTN" '@bash -c "button_click PW_WGC"' & \
+
+ "${pw_yad}" --plug=${KEY} --tabnum=1 --columns=3 --form --separator=";" \
+ --image "$PW_GUI_ICON_PATH/port_proton.png" \
+ --field=":CB" " DXVK (DX 9-11 to Vulkan)"\!"VKD3D (DX 12 to Vulkan)"\!"OPENGL " \
+ --field=":LBL" "" \
+ --field='DEBUG'!!"${loc_debug}":"BTN" '@bash -c "button_click DEBUG"' \
+ --field='WINECFG'!!"${loc_winecfg}":"BTN" '@bash -c "button_click WINECFG"' \
+ --field=":RO" " ${portname} ver.: ${install_ver}" \
+ --field=":LBL" "" \
+ --field='WINEFILE'!!"${loc_winefile}":"BTN" '@bash -c "button_click WINEFILE"' \
+ --field='WINECMD'!!"${loc_winecmd}":"BTN" '@bash -c "button_click WINECMD"' \
+ --field=":RO" " Scripts ver.: ${scripts_install_ver}" \
+ --field=":LBL" "" \
+ --field='WINEREG'!!"${loc_winereg}":"BTN" '@bash -c "button_click WINEREG"' \
+ --field='WINETRICKS'!!"${loc_winetricks}":"BTN" '@bash -c "button_click WINETRICKS"' &> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" & \
+
+ "${pw_yad}" --key=$KEY --notebook --borders=10 --width=800 --height=50 --no-buttons --text-align=center \
+ --on-top --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "$portname" --separator=";" \
+ --tab-pos=right --tab="PORT_PROTON" --tab="AUTOINSTALL" --center
+
+ export PW_YAD_SET=`cat "${PORT_WINE_TMP_PATH}/tmp_yad_form" | head -n 1 | awk '{print $1}'`
+ try_remove_file "${PORT_WINE_TMP_PATH}/tmp_yad_form"
+ echo "PW_YAD_SET=${PW_YAD_SET}"
+ export OUTPUT_START=`cat "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" | grep \;\; | awk '{print $1}'`
+ try_remove_file "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan"
+ echo "OUTPUT_START=$OUTPUT_START"
fi
+
export VULKAN_MOD=$(echo $OUTPUT_START | awk 'BEGIN {FS=";" } { print $1 }')
-if [ "${VULKAN_MOD}" = "DXVK" ]; then
- echo "dxvk" > "${PORT_WINE_TMP_PATH}/pw_vulkan"
-elif [ "${VULKAN_MOD}" = "VKD3D" ]; then
- echo "vkd3d" > "${PORT_WINE_TMP_PATH}/pw_vulkan"
-else
- echo "0" > "${PORT_WINE_TMP_PATH}/pw_vulkan"
+if [ "${VULKAN_MOD}" = "DXVK" ] ; then export PW_VULKAN_USE="dxvk"
+elif [ "${VULKAN_MOD}" = "VKD3D" ]; then export PW_VULKAN_USE="vkd3d"
+elif [ "${VULKAN_MOD}" = "OPENGL" ]; then export PW_VULKAN_USE="0"
fi
case "$PW_YAD_SET" in
100) PORTWINE_CREATE_SHORTCUT ;;
- 102) PORTWINE_DEBUG ;;
+ DEBUG|102) PORTWINE_DEBUG ;;
106) PORTWINE_LAUNCH ;;
- 108) PW_WINECFG ;;
- 110) PW_WINEFILE ;;
- 112) PW_WINECMD ;;
- 114) PW_WINEREG ;;
- 116) PW_WINETRICKS ;;
+ WINECFG|108) PW_WINECFG ;;
+ WINEFILE|110) PW_WINEFILE ;;
+ WINECMD|112) PW_WINECMD ;;
+ WINEREG|114) PW_WINEREG ;;
+ WINETRICKS|116) PW_WINETRICKS ;;
118) PW_EDIT_DB ;;
+ *) PW_AUTO_INSTALL_FROM_DB ;;
esac
########################################################################
STOP_PORTWINE
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
new file mode 100755
index 00000000..f6a5eca2
--- /dev/null
+++ b/data_from_portwine/scripts/var
@@ -0,0 +1,37 @@
+#!/bin/bash
+# Author: Castro-Fidel (PortWINE-Linux.ru)
+########################################################################
+#export PW_MANGOHUD=1
+#export MANGOHUD_CONFIG=full,height=500,font_size=24,position=top-left,toggle_hud=F12
+#export DXVK_HUD=fps,devinfo
+
+export PW_FORCE_DISABLED_GAMEMOD=0
+
+export PW_DEF_DXVK_VER=1.8.1
+export PW_DEF_VKD3D_VER=2.3
+
+export PW_FORCE_USE_VSYNC=2
+export PW_LOG=0
+export PW_TERM=""
+export PW_USE_TERMINAL=0
+
+export PW_WINDOWS_VER="7"
+export WINEARCH="win64"
+
+export mono_ver=6.1.2
+export gecko_ver=2.47.2
+export pw_libs_ver="_v9"
+
+export PW_FORCE_LARGE_ADDRESS_AWARE=1
+
+export porturl="http://portwine-linux.ru/"
+########################################################################
+ADD_IN_START_PORTWINE ()
+{
+echo " "
+}
+########################################################################
+ADD_IN_STOP_PORTWINE ()
+{
+echo " "
+}
diff --git a/data_from_portwine/scripts/vars/PortGOG_vars b/data_from_portwine/scripts/vars/PortGOG_vars
deleted file mode 100755
index 497ad0a3..00000000
--- a/data_from_portwine/scripts/vars/PortGOG_vars
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-# Author: PortWINE-Linux.ru
-########################################################################
-export gamename="GOG Galaxy"
-export gamedir="GOG Galaxy"
-export porturl="http://portwine-linux.ru/"
-export PATH_TO_GAME="${PORT_WINE_PATH}/data/pfx/drive_c/Program Files (x86)/${gamedir}"
-export gamestart="${PATH_TO_GAME}/GalaxyClient.exe"
-########################################################################
-export MESA_GL_VERSION_OVERRIDE=4.4COMPAT
-export WINEDLLOVERRIDES="winemenubuilder.exe=d"
-export PW_LOG=0 # Enable debug mode fo terminal
-export PW_NO_FSYNC=0 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
-export PW_NO_ESYNC=0 # Do not use eventfd-based in-process synchronization primitives
-export PW_DXVK_ASYNC=0
-export PW_USE_TERMINAL=0
-export PW_OLD_GL_STRING=0
-export PW_NO_WINEMFPLAY=0
-export PW_NVAPI_DISABLE=1
-export PW_NO_WRITE_WATCH=0 # 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_HIDE_NVIDIA_GPU=0
-export PW_FORCE_USE_VSYNC=2 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
-export PW_WINEDBG_DISABLE=1
-export PW_FORCE_DISABLED_GAMEMOD=0 # Force disabele gamemod
-export PW_FORCE_LARGE_ADDRESS_AWARE=1 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
-#export MANGOHUD=1
-########################################################################
-GalaxyCommunication ()
-{
-for ((;;)); do
- if [ $(pgrep !!!!.*)>'0' ]; then
- "${WINEPREFIX}/drive_c/ProgramData/GOG.com/Galaxy/redists/GalaxyCommunication.exe"
- break
- else
- sleep 2
- fi
-done
-}
-
-ADD_IN_START_PORTWINE ()
-{
-export LAUNCH_PARAMETERS="/runWithoutUpdating /deelevated"
-GalaxyCommunication &
-cd "${PATH_TO_GAME}"
-}
-########################################################################
-ADD_IN_STOP_PORTWINE ()
-{
-echo " "
-}
-########################################################################
-ADD_IN_POST_INSTALL ()
-{
-echo " "
-}
diff --git a/data_from_portwine/scripts/vars/PortLoL_vars b/data_from_portwine/scripts/vars/PortLoL_vars
deleted file mode 100755
index 125e720a..00000000
--- a/data_from_portwine/scripts/vars/PortLoL_vars
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-# Author: PortWINE-Linux.ru
-########################################################################
-export gamename="League_of_Legends"
-export gamedir="Riot Games/Riot Client"
-export porturl="http://portwine-linux.ru/league-of-legends-linux/"
-export PATH_TO_GAME="${PORT_WINE_PATH}/data/pfx/drive_c/${gamedir}"
-export gamestart="${PATH_TO_GAME}/RiotClientServices.exe"
-########################################################################
-#export MESA_GL_VERSION_OVERRIDE=4.4COMPAT
-export WINEDLLOVERRIDES="winemenubuilder.exe=d"
-export PW_LOG=0
-export PW_ACO=1
-export PW_NO_VR=1
-export PW_NO_FSYNC=1
-export PW_NO_ESYNC=1
-export PW_FILELOCK=1
-export PW_DXVK_ASYNC=0
-export PW_USE_SECCOMP=0
-export PW_NO_WINEMFPLAY=0
-export PW_NVAPI_DISABLE=1
-export PW_NO_WRITE_WATCH=1
-export PW_WINEDBG_DISABLE=1
-export PW_FORCE_LARGE_ADDRESS_AWARE=0
-#export MANGOHUD=1
-########################################################################
-ADD_IN_START_PORTWINE ()
-{
-export LAUNCH_PARAMETERS="--launch-product=league_of_legends --launch-patchline=live"
-cd "${PATH_TO_GAME}"
-
-if [ "$(cat /proc/sys/abi/vsyscall32)" -ne 0 ]
-then
- zenity --question --title="Fix for LoL anti-cheat" \
- --text='Root rights are required to execute the command: \n"sysctl -w abi.vsyscall32=0" and "sysctl -p"' --no-wrap
- if [ "$?" = 1 ]
- then
- exit 0
- fi
- pkexec sh -c 'sysctl -w abi.vsyscall32=0 && sysctl -p'
-fi
-sh "${PORT_SCRIPTS_PATH}"/fix_start_lol.sh | zenity --progress --title="Start PortLoL" --text="Please wait, launch is in progress, it may take few minutes" --pulsate --auto-close --auto-kill --width=450 &
-}
-########################################################################
-ADD_IN_STOP_PORTWINE ()
-{
-echo " "
-}
-########################################################################
-ADD_IN_POST_INSTALL ()
-{
-echo " "
-}
-
diff --git a/data_from_portwine/scripts/vars/PortMailRu_vars b/data_from_portwine/scripts/vars/PortMailRu_vars
deleted file mode 100755
index 505767f0..00000000
--- a/data_from_portwine/scripts/vars/PortMailRu_vars
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-# Author: PortWINE-Linux.ru
-########################################################################
-export gamename="GameMailRu"
-export gamedir="GameCenter"
-export porturl="http://portwine-linux.ru/mail-ru-linux"
-export PATH_TO_GAME="${PORT_WINE_PATH}/data/pfx/drive_c/users/steamuser/Local Settings/Application Data/${gamedir}"
-export gamestart="${PATH_TO_GAME}/GameCenter.exe"
-########################################################################
-export MESA_GL_VERSION_OVERRIDE=4.4COMPAT
-export WINEDLLOVERRIDES="winemenubuilder.exe=d"
-export PW_LOG=0
-export PW_ACO=1
-export PW_NO_VR=1
-export PW_FILELOCK=1
-export PW_DXVK_ASYNC=0
-export PW_USE_SECCOMP=1
-export PW_NO_WINEMFPLAY=0
-export PW_NVAPI_DISABLE=1
-export PW_NO_WRITE_WATCH=1
-export PW_WINEDBG_DISABLE=1
-export PW_FORCE_LARGE_ADDRESS_AWARE=1
-#export MANGOHUD=1
-########################################################################
-ADD_IN_START_PORTWINE ()
-{
-export LAUNCH_PARAMETERS=""
-cd "${PATH_TO_GAME}"
-}
-########################################################################
-ADD_IN_STOP_PORTWINE ()
-{
-echo " "
-}
-########################################################################
-ADD_IN_POST_INSTALL ()
-{
-echo " "
-}
diff --git a/data_from_portwine/scripts/vars/PortOSU_vars b/data_from_portwine/scripts/vars/PortOSU_vars
deleted file mode 100755
index 16329a45..00000000
--- a/data_from_portwine/scripts/vars/PortOSU_vars
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-# Author: PortWINE-Linux.ru
-########################################################################
-export gamename="OSU!"
-export gamedir="osu!"
-export porturl="http://portwine-linux.ru/osu-linux/"
-export PATH_TO_GAME="${PORT_WINE_PATH}/data/pfx/drive_c/Program Files (x86)/${gamedir}"
-export gamestart="${PATH_TO_GAME}/osu!.exe"
-########################################################################
-#export MESA_GL_VERSION_OVERRIDE=4.4COMPAT
-export WINEDLLOVERRIDES=""
-export PW_LOG=0 # Enable debug mode fo terminal
-export PW_NO_FSYNC=0 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
-export PW_NO_ESYNC=0 # Do not use eventfd-based in-process synchronization primitives
-export PW_DXVK_ASYNC=0
-export PW_USE_TERMINAL=0
-export PW_OLD_GL_STRING=0
-export PW_NVAPI_DISABLE=0
-export PW_NO_WRITE_WATCH=0 # 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_HIDE_NVIDIA_GPU=0
-export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
-export PW_WINEDBG_DISABLE=1
-export PW_FORCE_DISABLED_GAMEMOD=0 # Force disabele gamemod
-export PW_FORCE_LARGE_ADDRESS_AWARE=0 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
-export PULSE_LATENCY_MSEC=40
-#export MANGOHUD=1
-########################################################################
-ADD_IN_START_PORTWINE ()
-{
-export LAUNCH_PARAMETERS=""
-export STAGING_AUDIO_DURATION=5000
-cd "${PATH_TO_GAME}"
-}
-########################################################################
-ADD_IN_STOP_PORTWINE ()
-{
-echo " "
-}
-########################################################################
-ADD_IN_POST_INSTALL ()
-{
-echo " "
-}
diff --git a/data_from_portwine/scripts/vars/PortOrigin_vars b/data_from_portwine/scripts/vars/PortOrigin_vars
deleted file mode 100755
index 74e439ca..00000000
--- a/data_from_portwine/scripts/vars/PortOrigin_vars
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-# Author: PortWINE-Linux.ru
-########################################################################
-export gamename="Origin"
-export gamedir="Origin"
-export PATH_TO_GAME="${PORT_WINE_PATH}/data/pfx/drive_c/Program Files (x86)/${gamedir}"
-export gamestart="${PATH_TO_GAME}/Origin.exe"
-export porturl="http://portwine-linux.ru/origin-linux/"
-########################################################################
-#export MESA_GL_VERSION_OVERRIDE=4.4COMPAT
-export WINEDLLOVERRIDES="winemenubuilder.exe=d"
-export PW_LOG=0 # Enable debug mode fo terminal
-export PW_NO_FSYNC=0 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
-export PW_NO_ESYNC=0 # Do not use eventfd-based in-process synchronization primitives
-export PW_DXVK_ASYNC=0
-export PW_USE_TERMINAL=0
-export PW_OLD_GL_STRING=0
-export PW_NO_WINEMFPLAY=0
-export PW_NVAPI_DISABLE=1
-export PW_NO_WRITE_WATCH=0 # 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_HIDE_NVIDIA_GPU=0
-export PW_FORCE_USE_VSYNC=2 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
-export PW_WINEDBG_DISABLE=1
-export PW_FORCE_DISABLED_GAMEMOD=0 # Force disabele gamemod
-export PW_FORCE_LARGE_ADDRESS_AWARE=1 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
-#export MANGOHUD=1
-########################################################################
-ADD_IN_START_PORTWINE ()
-{
-export LAUNCH_PARAMETERS=""
-cd "${PATH_TO_GAME}"
-sed -i 's%key="EnableIgo" value="true"%key="EnableIgo" value="false"%g' "${WINEPREFIX}/drive_c/users/steamuser/Application Data/Origin/local_"*".xml"
-}
-########################################################################
-ADD_IN_STOP_PORTWINE ()
-{
-echo " "
-}
-########################################################################
-ADD_IN_POST_INSTALL ()
-{
-echo " "
-}
diff --git a/data_from_portwine/scripts/vars/PortProton_vars b/data_from_portwine/scripts/vars/PortProton_vars
deleted file mode 100755
index 025394b1..00000000
--- a/data_from_portwine/scripts/vars/PortProton_vars
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-# Author: PortWINE-Linux.ru
-########################################################################
-export porturl="http://portwine-linux.ru/"
-########################################################################
-#export MESA_GL_VERSION_OVERRIDE=4.4COMPAT
-export PW_LOG=0 # Enable debug mode fo terminal
-export PW_USE_TERMINAL=0
-export PW_FORCE_USE_VSYNC=2 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
-export PW_WINEDBG_DISABLE=0
-export PW_FORCE_DISABLED_GAMEMOD=0 # Force disabele gamemod
-#export PW_MANGOHUD=1
-#export MANGOHUD_CONFIG=full,height=500,font_size=32,position=top-right,toggle_hud=F9
-#export DXVK_HUD=fps,devinfo
-#export PW_OLD_GL_STRING=0
-########################################################################
-ADD_IN_START_PORTWINE ()
-{
-cd "${PATH_TO_GAME}"
-}
-########################################################################
-ADD_IN_STOP_PORTWINE ()
-{
-echo " "
-}
-########################################################################
-ADD_IN_POST_INSTALL ()
-{
-update-desktop-database -q "${HOME}/.local/share/applications"
-}
diff --git a/portwine_install_script/PortNAME-XX b/portwine_install_script/PortNAME-XX
index 3f0d4370..2746f9d7 100644
--- a/portwine_install_script/PortNAME-XX
+++ b/portwine_install_script/PortNAME-XX
@@ -133,10 +133,6 @@ else
rm -fR "${PORT_WINE_PATH}/data/${CLEAN_PORT}"
fi
done
- if [ -d "${PORT_WINE_PATH}/data/pfx/" ] ; then
- export PORT_PFX="${PORT_WINE_PATH}/data/pfx"
- mv -f "${PORT_PFX}" "${PORT_PFX}_old"
- fi
fi
if [ -d "${PORT_WINE_PATH}/data/scripts" ] ; then
rm -f "${PORT_WINE_PATH}/data/scripts/"* > /dev/null 2>&1
@@ -156,7 +152,7 @@ read "update_loc" < "${PORT_WINE_TMP_PATH}/${portname}_loc"
export update_loc=${update_loc}
########################################################################
cd "${PORT_WINE_PATH}"
-tail -n +178 "${links}/${setup_script}" > "${PORT_WINE_PATH}/${ARCH_NAME}"
+tail -n +169 "${links}/${setup_script}" > "${PORT_WINE_PATH}/${ARCH_NAME}"
if [ "${s_install}" = "1" ] ; then
tar -Jxvf "${PORT_WINE_PATH}/${ARCH_NAME}" -C "${PORT_WINE_PATH}/"
else
@@ -164,12 +160,7 @@ else
fi
chmod 755 -R "${PORT_WINE_PATH}"
mv -f "${PORT_WINE_PATH}/${ARCH_NAME}" "${PORT_WINE_PATH}/data/tmp"
-sed -n 1,177p "${links}/${setup_script}" > "${PORT_WINE_PATH}/data/tmp/${setup_script}"
-########################################################################
-if [ -d "${PORT_PFX}_old" ] ; then
- rm -fR "${PORT_PFX}"
- mv -f "${PORT_PFX}_old" "${PORT_PFX}"
-fi
+sed -n 1,168p "${links}/${setup_script}" > "${PORT_WINE_PATH}/data/tmp/${setup_script}"
echo "${portname}" > "${PORT_WINE_PATH}/data/tmp/portname"
########################################################################
cd "${PORT_WINE_PATH}/data/scripts"