From e631c92273b3c3c3b8b04524388627726e74159c Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Thu, 28 Sep 2023 17:48:44 +0300 Subject: [PATCH] Scripts version 2224 --- data_from_portwine/changelog_eng | 6 ++++++ data_from_portwine/changelog_rus | 6 ++++++ data_from_portwine/img/gui/error_file.png | Bin 0 -> 10626 bytes data_from_portwine/scripts/lang | 6 +++++- data_from_portwine/scripts/runlib | 20 +++++++++++--------- data_from_portwine/scripts/start.sh | 13 ++++++++++--- data_from_portwine/scripts/var | 4 ++-- data_from_portwine/scripts/zen_yad_gui | 21 +++++++++++++++++---- 8 files changed, 57 insertions(+), 19 deletions(-) create mode 100644 data_from_portwine/img/gui/error_file.png diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 41c4e433..26001355 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,12 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2224### Date: 28.09.2023 / Download update size: 210 megabytes +* global cleaning of database files (thanks to Boria138) +* updated PROTON_LG to version 8-17 (fixed community and support tabs in the Genshin Impact game) +* accelerated search nvngx.dll when NVAPI and DLSS are enabled +* added a check to run the .desktop file of a non-existent application + ###Scripts version 2223### Date: 23.09.2023 / Download update size: 8 megabytes * updated DOTNET prefix * blocked use USE_US_LAYOUT under Wayland diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index b47f685d..8bb4250c 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,12 @@ ----------------------------------------- История изменений: +###Scripts version 2224### Дата: 28.09.2023 / Размер скачиваемого обновления: 210 мегабайт +* глобальная чистка database файлов (спасибо Boria138) +* обновлен PROTON_LG до версии 8-17 (исправлены вкладки сообщество и поддержка в игре Genshin Impact) +* ускорен поиск nvngx.dll при включении NVAPI и DLSS +* добавлена проверка на запуск .desktop файла несуществующего приложения + ###Scripts version 2223### Дата: 23.09.2023 / Размер скачиваемого обновления: 8 мегабайт * обновлен префикс DOTNET * временно заблокировано использование USE_US_LAYOUT под Wayland diff --git a/data_from_portwine/img/gui/error_file.png b/data_from_portwine/img/gui/error_file.png new file mode 100644 index 0000000000000000000000000000000000000000..b26740bc3fd064d7daded5647a73609889deb14d GIT binary patch literal 10626 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 literal 0 HcmV?d00001 diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index b39baeea..4cd253cb 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -205,6 +205,7 @@ if [[ "${update_loc}" == "RUS" ]] ; then export loc_gui_edit_db="Изменение файла настроек для:" export loc_gui_edit_db_help="ПРИМЕЧАНИЕ: Для вывода справки по каждому пункту, просто наведите курсор мыши на текст." + export loc_cancel="ОТМЕНИТЬ" export loc_gui_cancel="ОТМЕНИТЬ ИЗМЕНЕНИЯ" export loc_gui_cancel_help="Отменить текущие изменения и вернутся в предыдущее меню." @@ -255,8 +256,9 @@ if [[ "${update_loc}" == "RUS" ]] ; then export loc_gui_no="НЕТ" export loc_gui_yes="ДА" + export loc_gui_missing_shortcut="\nНе удалось найти файл:\n${portwine_exe}\n\nВНИМАНИЕ:\nЕсли вы забыли примонтировать диск с запускаемым приложением, нажмите ОТМЕНИТЬ!" export loc_gui_create_shortcut="СОЗДАТЬ ЯРЛЫК" - export loc_gui_delete_shortcut="УДАЛИТЬ ЯРЛЫК" + export loc_gui_delete_shortcut="УДАЛИТЬ ЯРЛЫКИ" export loc_gui_launch="ЗАПУСТИТЬ" export loc_gui_debug="СОЗДАТЬ ЛОГ" export loc_gui_edit_db_start="НАСТРОИТЬ" @@ -457,6 +459,7 @@ elif [[ "${update_loc}" == "ENG" ]] ; then export loc_gui_edit_db="Change settings in database file for" export loc_gui_edit_db_help="NOTE: To display help for each item, simply hover your mouse over the text" + export loc_cancel="CANCEL" export loc_gui_cancel="CANCEL THE CHANGES" export loc_gui_cancel_help="Cancel the current changes and return to the previous menu." @@ -507,6 +510,7 @@ A brief instruction: export loc_gui_no="NO" export loc_gui_yes="YES" + export loc_gui_missing_shortcut="\nCould not find the file:\n${portwine_exe}\n\nATTENTION:\nIf you forgot to mount the disk with the running application, click CANCEL!" export loc_gui_create_shortcut="CREATE SHORTCUT" export loc_gui_delete_shortcut="DELETE SHORTCUT" export loc_gui_launch="LAUNCH" diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 6bc0d47a..5295c8e6 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -64,12 +64,12 @@ start_portwine () { if [[ "${PW_LOG}" == 1 ]] ; then export WINEDEBUG="fixme-all,err+loaddll,err+dll,err+file,err+reg" - export DXVK_LOG_LEVEL="warn" - export VKD3D_DEBUG="warn" + export DXVK_LOG_LEVEL="err" + export VKD3D_DEBUG="err" export WINE_MONO_TRACE="E:System.NotImplementedException" export VK_LOADER_DEBUG="none" export VKBASALT_LOG_LEVEL="none" - export DXVK_NVAPI_LOG_LEVEL=warn + export DXVK_NVAPI_LOG_LEVEL="err" else export WINEDEBUG="-all" export DXVK_LOG_LEVEL="none" @@ -77,7 +77,7 @@ start_portwine () { export VKD3D_DEBUG="none" export DXVK_LOG_PATH="none" export VKBASALT_LOG_LEVEL="none" - export DXVK_NVAPI_LOG_LEVEL=none + export DXVK_NVAPI_LOG_LEVEL="none" fi if [[ "${PW_NO_ESYNC}" == 1 ]] @@ -138,11 +138,13 @@ start_portwine () { export WINE_HIDE_NVIDIA_GPU=0 # export DXVK_NVAPI_DRIVER_VERSION= elif [[ "${PW_USE_NVAPI_AND_DLSS}" == 1 ]] ; then - if ! try_copy_file `find /usr/* -type f -name "nvngx.dll" 2>/dev/null | awk '{print $1}' | grep '/lib/'` "${WINEPREFIX}/drive_c/windows/system32/" - then try_copy_file "${PW_PLUGINS_PATH}/nvngx/nvngx.dll" "${WINEPREFIX}/drive_c/windows/system32/" - fi - if ! try_copy_file `find /usr/* -type f -name "_nvngx.dll" 2>/dev/null | awk '{print $1}' | grep '/lib/'` "${WINEPREFIX}/drive_c/windows/system32/" - then try_copy_file "${PW_PLUGINS_PATH}/nvngx/_nvngx.dll" "${WINEPREFIX}/drive_c/windows/system32/" + FIND_NVNGX="$(dirname $(find /usr/* -type f -name "nvngx.dll" 2>/dev/null | head -n 1 | awk '{print $1}'))" + if [[ ! -z "$FIND_NVNGX" ]] ; then + try_copy_file "${FIND_NVNGX}/nvngx.dll" "${WINEPREFIX}/drive_c/windows/system32/" + try_copy_file "${FIND_NVNGX}/_nvngx.dll" "${WINEPREFIX}/drive_c/windows/system32/" + else + try_copy_file "${PW_PLUGINS_PATH}/nvngx/nvngx.dll" "${WINEPREFIX}/drive_c/windows/system32/" + try_copy_file "${PW_PLUGINS_PATH}/nvngx/_nvngx.dll" "${WINEPREFIX}/drive_c/windows/system32/" fi enabled_fake_nvidia_videocard 0 export DXVK_ENABLE_NVAPI=1 diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index c4288bf2..c2622888 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -3,8 +3,13 @@ export NO_AT_BRIDGE=1 export pw_full_command_line=("$0" $*) -if [ -f "$1" ]; then +MISSING_DESKTOP_FILE=0 + +if [[ -f "$1" ]] ; then export portwine_exe="$(readlink -f "$1")" +elif [[ "$1" == *.exe ]] ; then + export portwine_exe="$1" + MISSING_DESKTOP_FILE=1 fi . "$(dirname $(readlink -f "$0"))/runlib" kill_portwine @@ -16,6 +21,8 @@ if [[ -f "/usr/bin/portproton" ]] && [[ -f "${HOME}/.local/share/applications/Po exit 0 fi +[[ "$MISSING_DESKTOP_FILE" == 1 ]] && portwine_missing_shortcut + if [[ "${XDG_SESSION_TYPE}" = "wayland" ]] && [[ ! -f "${PORT_WINE_TMP_PATH}/check_wayland" ]]; then zenity_info "$PW_WAYLAND_INFO" echo "1" > "${PORT_WINE_TMP_PATH}/check_wayland" @@ -140,8 +147,8 @@ portwine_start_debug () { free -m >> "${PORT_WINE_PATH}/${portname}.log" echo "-----------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "Graphic cards and drivers:" >> "${PORT_WINE_PATH}/${portname}.log" - echo 'lspci | grep VGA:' >> "${PORT_WINE_PATH}/${portname}.log" - echo $LSPCI_VGA >> "${PORT_WINE_PATH}/${portname}.log" + echo 'lspci -k | grep -EA3 VGA|3D|Display :' >> "${PORT_WINE_PATH}/${portname}.log" + echo "$(lspci -k | grep -EA3 'VGA|3D|Display')" >> "${PORT_WINE_PATH}/${portname}.log" [[ `command -v glxinfo` ]] && glxinfo -B >> "${PORT_WINE_PATH}/${portname}.log" echo " " >> "${PORT_WINE_PATH}/${portname}.log" echo "inxi -G:" >> "${PORT_WINE_PATH}/${portname}.log" diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 3d96b84c..9326b58e 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2223 +#SCRIPTS_NEXT_VERSION=2224 ######################################################################## export PW_MANGOHUD=0 export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt @@ -39,7 +39,7 @@ export PW_WINE_USE="PROTON_LG" export PW_PLUGINS_VER="_v12" export PW_FAKE_DLSS_VER="230506" ###WINE_PROTON_LG### -export PW_LG_VER="8-15-1" +export PW_LG_VER="8-17" export PW_PROTON_LG_VER="PROTON_LG_${PW_LG_VER}" ###WINE_PROTON_GE### export PW_WINE_LG_VER="8.5" diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui index 1fe2d54a..87c609e4 100755 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -534,11 +534,24 @@ portwine_create_shortcut () { } portwine_delete_shortcut () { - rm -f "`grep -il "${portwine_exe}" "${HOME}/.local/share/applications"/*.desktop`" - rm -f "`grep -il "${portwine_exe}" "${PORT_WINE_PATH}"/*.desktop`" + rm -f "$(grep -il "${portwine_exe}" "${HOME}/.local/share/applications"/*.desktop)" $>/dev/null + rm -f "$(grep -il "${portwine_exe}" "${PORT_WINE_PATH}"/*.desktop)" $>/dev/null if [[ -d "${HOME}/Desktop" ]] ; then - rm -f "`grep -il "${portwine_exe}" "${HOME}/Desktop"/*.desktop`" + rm -f "$(grep -il "${portwine_exe}" "${HOME}/Desktop"/*.desktop)" $>/dev/null elif [[ -d "${HOME}/Рабочий стол" ]] ; then - rm -f "`grep -il "${portwine_exe}" "${HOME}/Рабочий стол"/*.desktop`" + rm -f "$(grep -il "${portwine_exe}" "${HOME}/Рабочий стол"/*.desktop)" $>/dev/null fi } + +portwine_missing_shortcut () { + "${pw_yad}" --title="${loc_gui_error}." --form --borders=3 \ + --window-icon "$PW_GUI_ICON_PATH/port_proton.png" \ + --image "$PW_GUI_ICON_PATH/error_file.png" \ + --text "$loc_gui_missing_shortcut" \ + --button="$loc_gui_delete_shortcut":0 \ + --button="$loc_cancel":1 + if [ $? -eq "0" ] ; then + portwine_delete_shortcut + fi + exit 0 +}