From 71cbcb7b6588a206056045a70b112c45d07a5bae Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Thu, 4 Apr 2024 21:31:03 +0300 Subject: [PATCH] Scripts version 2272 --- data_from_portwine/changelog_eng | 11 +- data_from_portwine/changelog_rus | 14 ++- data_from_portwine/scripts/credits | 28 ++--- data_from_portwine/scripts/functions_helper | 129 ++++++++++---------- data_from_portwine/scripts/lang | 4 +- data_from_portwine/scripts/start.sh | 18 +-- data_from_portwine/scripts/var | 2 +- 7 files changed, 112 insertions(+), 94 deletions(-) diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 865ef22..fefc9e6 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,15 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2272### Date: 04.04.2024 / Download update size: 15 megabytes +* script refactoring: + - yad_gui script combined with functions_helper + - runlib script combined with start.sh + - all functions from runlib, yad_gui and start.sh moved to functions_helper +* fixed winetricks update on some systems (thanks to Boria138) +* when cleaning the prefix, Common Files directories are not deleted from Program Files (to save vst libraries) +* updated the interface software (yad) to version 13.0 with Cyrillic support by default + ###Scripts version 2271### Date: 03.04.2024 / Download update size: 15 megabytes * improved interface of the prefix manager (xterm has been replaced with the standard PortProton interface) * fixed the launch of the game "Dragon Age: Origin" from EAapp @@ -1288,7 +1297,7 @@ export WINE_FULLSCREEN_FSR="1" (by default) * updated db files ###Scripts version 2065### -* HOTFIX - correcting the termination of the yad and yad_v12_3 processes +* HOTFIX - correcting the termination of the yad and yad_v13_0 processes ###Scripts version 2064### * added notification to the user about possible problems when starting in a Wayland session (once and only under Wayland) diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index f1c38f4..0036073 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,16 @@ ----------------------------------------- История изменений: +###Scripts version 2272### Дата: 04.04.2024 / Размер скачиваемого обновления: 15 мегабайт +* рефакторинг скриптов: + - скрипт yad_gui объеденен с functions_helper + - скрипт runlib объеденен с start.sh + - все функции из runlib, yad_gui и start.sh перенесены в functions_helper +* исправлено обновление winetricks на некоторых системах (спасибо Boria138) +* при чистке префикса не удаляются каталоги Common Files из Program Files (для сохранения библиотек vst) +* обновлено ПО интерфейса (yad) до версии 13.0 с поддержкой кирилицы по умолчанию +* дополнительные небольшие улучшения интерфейса + ###Scripts version 2271### Дата: 03.04.2024 / Размер скачиваемого обновления: 15 мегабайт * улучшен интерфейс менеджера префиксов (xterm заменен на стандартный интерфейс PortProton) * исправлена работа русского языка в EAapp (для применения необходимо запустить EALauncher и в PP выбрать НАСТРОЙКИ -> СБРОСИТЬ НАСТРОЙКИ) @@ -1102,7 +1112,7 @@ export WINE_FULLSCREEN_FSR="1" (используется по умолчанию * обновлены db файлы ###Scripts version 2065### -* HOTFIX - корректировка завершения процессов yad и yad_v12_3 +* HOTFIX - корректировка завершения процессов yad и yad_v13_0 ###Scripts version 2064### * добавлено уведомление пользователю о возможных проблемах при запуске в Wayland сессии (один раз и только под Wayland) @@ -1509,7 +1519,7 @@ PS: не забывает для активации добавить перем ###Scripts version 1104### * крупное обновлеение контейнера (libs_v16): - - добавлен /bin/yad_v12_3 версии 10.1 скомпилированный специально для будущего меню в трее) + - добавлен /bin/yad_v13_0 версии 10.1 скомпилированный специально для будущего меню в трее) - обновлен MANGOHUD (требуется проверка под OpenGL) - обновлен 7z необходимый для будущей автоматической установки Rockstar Game Launcher * для тестовой поддержки wayland добавлена переменная в скрипт var: GDK_BACKEND="x11" diff --git a/data_from_portwine/scripts/credits b/data_from_portwine/scripts/credits index a2906fa..6dd9237 100755 --- a/data_from_portwine/scripts/credits +++ b/data_from_portwine/scripts/credits @@ -5,7 +5,7 @@ if [ "${update_loc}" = "RUS" ] then KEY_CREDITS=$RANDOM -"${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=1 --show-uri \ +"${pw_yad_v13_0}" --plug="${KEY_CREDITS}" --tabnum=1 --show-uri \ --image-path="$PW_GUI_ICON_PATH" --image="port_proton" --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ --text-align=center --scroll --text="PortProton v. ${install_ver} scripts v. ${scripts_install_ver} @@ -18,7 +18,7 @@ https://linux-gaming.ru Подробнее см. в Лицензия." 2>/dev/null & -"${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=2 \ +"${pw_yad_v13_0}" --plug="${KEY_CREDITS}" --tabnum=2 \ --text-align=center --scroll --text="Автор: Casro-Fidel (Михаил Тергоев) Помощники разработчика и тестировщики: @@ -44,7 +44,7 @@ Boria138 Akai " 2>/dev/null & -"${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=3 --text-info --scroll <<< " Лицензия Массачусетского технологического института (MIT License) +"${pw_yad_v13_0}" --plug="${KEY_CREDITS}" --tabnum=3 --text-info --scroll <<< " Лицензия Массачусетского технологического института (MIT License) Авторские права © $(date +'%Y') Castro-Fidel (linux-gaming.ru) @@ -67,7 +67,7 @@ Akai ВНЕ ИЛИ В СВЯЗИ С ПРОГРАММНЫМ ОБЕСПЕЧЕНИЕМ ИЛИ ИСПОЛЬЗОВАНИЕМ ИЛИ ДРУГИМИ СДЕЛКАМИ В ПРОГРАММНОГО ОБЕСПЕЧЕНИЯ." 2>/dev/null & -"${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=4 \ +"${pw_yad_v13_0}" --plug="${KEY_CREDITS}" --tabnum=4 \ --text-info --fontname="Serif bold italic 12" --show-uri --scroll \ <<< ' Проект поддержали: https://boosty.to/portwine-linux.ru @@ -337,7 +337,7 @@ Akai Список будет дополняться...' 2>/dev/null & -"${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=5 --text="Хотите присоединится и помочь в развитии проекта:" \ +"${pw_yad_v13_0}" --plug="${KEY_CREDITS}" --tabnum=5 --text="Хотите присоединится и помочь в развитии проекта:" \ --title=JOIN --window-icon=group --image=system-config-users --uri-color=red --show-uri \ --text-info --scroll <<< \ "Website: https://linux-gaming.ru/ @@ -349,7 +349,7 @@ boosty: https://boosty.to/portwine-linux.ru Yandex кошелек: 410012267513818 -------------------------------------------" 2>/dev/null & -"${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=6 --show-uri --title="THIRD PARTY LIBRARIES" \ +"${pw_yad_v13_0}" --plug="${KEY_CREDITS}" --tabnum=6 --show-uri --title="THIRD PARTY LIBRARIES" \ --fontname="Serif bold italic 10" --text-info <<< " Сторонние библиотеки, которые используются в PortProton PortProton собран на основе бесплатных библиотек программного обеспечения: @@ -359,7 +359,7 @@ WINE-PROTON-GE: https://github.com/GloriousEggroll/proton-ge-custom/ Kron4ek/Wine: https://github.com/Kron4ek/Wine-Builds YAD: https://github.com/v1cont/yad" 2>/dev/null & -"${pw_yad_v12_3}" --title "О НАС" --key="${KEY_CREDITS}" --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ +"${pw_yad_v13_0}" --title "О НАС" --key="${KEY_CREDITS}" --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ --notebook --no-buttons --tab-pos=bottom \ --tab="О PORTPROTON" --tab="АВТОРЫ" --tab="ЛИЦЕНЗИЯ" --tab="СПОНСОРЫ" --tab="ПРИСОЕДИНИТЬСЯ" \ --tab="БИБЛИОТЕКИ" @@ -372,7 +372,7 @@ else KEY_CREDITS=$RANDOM -"${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=1 --show-uri \ +"${pw_yad_v13_0}" --plug="${KEY_CREDITS}" --tabnum=1 --show-uri \ --image-path="$PW_GUI_ICON_PATH" --image="port_proton" \ --text-align=center --scroll --text="PortProton v. ${install_ver} scripts v. ${scripts_install_ver} @@ -386,7 +386,7 @@ This program comes with absolutely no warranty. See the License for details." 2>/dev/null & -"${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=2 \ +"${pw_yad_v13_0}" --plug="${KEY_CREDITS}" --tabnum=2 \ --text-align=center --scroll --text="Author: Casro-Fidel (Mikhail Tergoev) Developer assistants and testers: @@ -412,7 +412,7 @@ Boria138 Akai " 2>/dev/null & -"${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=3 --text-info --scroll <<< "MIT License +"${pw_yad_v13_0}" --plug="${KEY_CREDITS}" --tabnum=3 --text-info --scroll <<< "MIT License Copyright (©) 2022 Castro-Fidel (linux-gaming.ru) @@ -434,7 +434,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." 2>/dev/null & -"${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=4 \ +"${pw_yad_v13_0}" --plug="${KEY_CREDITS}" --tabnum=4 \ --text-info --fontname="Serif bold italic 12" --show-uri --scroll \ <<< ' The project was supported: https://boosty.to/portwine-linux.ru: @@ -705,7 +705,7 @@ SOFTWARE." 2>/dev/null & The list will be updated...' 2>/dev/null & -"${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=5 --text="Do you want to join and help in the development of the project:" \ +"${pw_yad_v13_0}" --plug="${KEY_CREDITS}" --tabnum=5 --text="Do you want to join and help in the development of the project:" \ --title=JOIN --window-icon=group --image=system-config-users --uri-color=red --show-uri \ --text-info --scroll <<< \ "Website: http://linux-gaming.ru @@ -717,7 +717,7 @@ boosty: https://boosty.to/portwine-linux.ru Yandex wallet: 410012267513818 -------------------------------------------" 2>/dev/null & -"${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=6 --show-uri --title="THIRD PARTY LIBRARIES" \ +"${pw_yad_v13_0}" --plug="${KEY_CREDITS}" --tabnum=6 --show-uri --title="THIRD PARTY LIBRARIES" \ --fontname="Serif bold italic 10" --text-info <<< " Third-party libraries that are used in PortProton PortProton is built on the basis of the following free software libraries: @@ -728,7 +728,7 @@ Kron4ek/Wine: https://github.com/Kron4ek/Wine-Builds YAD: https://github.com/v1cont/yad" 2>/dev/null & -"${pw_yad_v12_3}" --title "ABOUT US" --key="${KEY_CREDITS}" ---window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ +"${pw_yad_v13_0}" --title "ABOUT US" --key="${KEY_CREDITS}" ---window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ --notebook --no-buttons --tab-pos=bottom \ --tab="ABOUT PORTPROTON" --tab="AUTORS" --tab="LICENSE" --tab="SPONSORS" --tab="JOIN" \ --tab="THIRD PARTY LIBRARIES" diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index d9d1af0..9cdfd80 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -130,7 +130,7 @@ try_download_no_mirror () { set -o pipefail curl -f -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$1" -o "$2" 2>&1 | \ tr '\r' '\n' | sed -ur 's|[# ]+||g;s|.*=.*||g;s|.*|#Downloading at &\n&|g' | \ - "${pw_yad_v12_3}" --progress --percentage=0 --text="${loc_downloading} ${PW_DOWNLOAD_FILE_NAME}" --auto-close --no-escape \ + "${pw_yad_v13_0}" --progress --percentage=0 --text="${loc_downloading} ${PW_DOWNLOAD_FILE_NAME}" --auto-close --no-escape \ --auto-kill --center --text-align="center" --fixed --no-buttons --title "PortProton" --width=500 --height=90 \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --borders=15 if [ "${PIPESTATUS[0]}" != 0 ] ; then @@ -151,11 +151,11 @@ try_download () { # -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "ftp://171.22.215.18/archives/${PW_DOWNLOAD_FILE_NAME}" -o "$2" return 0 fi - [[ ! -f "${pw_yad_v12_3}" ]] && local pw_yad_v12_3="yad" + [[ ! -f "${pw_yad_v13_0}" ]] && local pw_yad_v13_0="yad" set -o pipefail curl -f -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$1" -o "$2" 2>&1 | \ tr '\r' '\n' | sed -ur 's|[# ]+||g;s|.*=.*||g;s|.*|#Downloading at &\n&|g' | \ - "${pw_yad_v12_3}" --progress --percentage=0 --text="${loc_downloading} ${PW_DOWNLOAD_FILE_NAME}" --auto-close --no-escape \ + "${pw_yad_v13_0}" --progress --percentage=0 --text="${loc_downloading} ${PW_DOWNLOAD_FILE_NAME}" --auto-close --no-escape \ --auto-kill --center --text-align="center" --fixed --no-buttons --title "PortProton" --width=500 --height=90 \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --borders=15 if [ "${PIPESTATUS[0]}" != 0 ] ; then @@ -163,7 +163,7 @@ try_download () { print_info "Try download ${PW_DOWNLOAD_FILE_NAME} from FTP" curl -f -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -L "ftp://171.22.215.18/archives/${PW_DOWNLOAD_FILE_NAME}" -o "$2" 2>&1 | \ tr '\r' '\n' | sed -ur 's|[# ]+||g;s|.*=.*||g;s|.*|#Downloading at &\n&|g' | \ - "${pw_yad_v12_3}" --progress --percentage=0 --text="${loc_downloading} ${PW_DOWNLOAD_FILE_NAME}" --auto-close --no-escape \ + "${pw_yad_v13_0}" --progress --percentage=0 --text="${loc_downloading} ${PW_DOWNLOAD_FILE_NAME}" --auto-close --no-escape \ --auto-kill --center --text-align="center" --fixed --no-buttons --title "PortProton" --width=500 --height=90 \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --borders=15 if [ "${PIPESTATUS[0]}" != 0 ] ; then @@ -187,7 +187,7 @@ try_download_to_path () { curl -f -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -H 'Cache-Control: no-cache, no-store' \ -H 'Pragma: no-cache' -L "$1" -o "$2/$PW_DOWNLOAD_FILE_NAME" 2>&1 | \ tr '\r' '\n' | sed -ur 's|[# ]+||g;s|.*=.*||g;s|.*|#Downloading at &\n&|g' | \ - "${pw_yad_v12_3}" --progress --percentage=0 --text="${loc_downloading} ${PW_DOWNLOAD_FILE_NAME}" --auto-close --no-escape \ + "${pw_yad_v13_0}" --progress --percentage=0 --text="${loc_downloading} ${PW_DOWNLOAD_FILE_NAME}" --auto-close --no-escape \ --auto-kill --center --text-align="center" --fixed --no-buttons --title "PortProton" --width=500 --height=90 \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --borders=15 if [ "${PIPESTATUS[0]}" != 0 ] ; then @@ -378,9 +378,7 @@ pw_clear_pfx () { try_remove_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/Program Files/Internet Explorer" try_remove_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/Program Files/Windows Media Player" try_remove_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/Program Files/Windows NT" - try_remove_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/Program Files/Common Files" try_remove_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/Program Files (x86)/Internet Explorer" - try_remove_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/Program Files (x86)/Common Files" try_remove_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/Program Files (x86)/Windows Media Player" try_remove_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/Program Files (x86)/Windows NT" rm -f "${PORT_WINE_TMP_PATH}"/*.bin @@ -812,12 +810,12 @@ stop_portwine () { kill_portwine && try_remove_dir "${PW_WINELIB}/var" find "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/" -maxdepth 1 -type f -name "*.tmp" -delete - if [[ ! -z "$(pgrep -a yad_v12_3 | grep "\--notification" | awk '{print $1}')" ]] ; then - kill -s SIGUSR1 "`pgrep -a yad_v12_3 | grep "\--notification" | awk '{print $1}'`" 2>/dev/null + if [[ ! -z "$(pgrep -a yad_v13_0 | grep "\--notification" | awk '{print $1}')" ]] ; then + kill -s SIGUSR1 "`pgrep -a yad_v13_0 | grep "\--notification" | awk '{print $1}'`" 2>/dev/null fi add_in_stop_portwine #&>/dev/null kill -n 9 `pgrep -a start.sh | grep -i '/PortProton/' | awk '{print $1}'` > /dev/null 2>&1 - killall yad_v12_3 &>/dev/null + killall yad_v13_0 &>/dev/null exit 0 } export -f stop_portwine @@ -974,7 +972,7 @@ pw_check_and_download_dxvk_and_vkd3d () { pw_check_and_download_plugins () { if [[ ! -f "${PW_PLUGINS_PATH}/portable/bin/yad_new" ]] \ - || [[ ! -f "${PW_PLUGINS_PATH}/portable/bin/yad_v12_3" ]] + || [[ ! -f "${PW_PLUGINS_PATH}/portable/bin/yad_v13_0" ]] then print_info "Download and install plugins${PW_PLUGINS_VER}..." if command -v yad &>/dev/null ; then @@ -1029,7 +1027,7 @@ pw_check_and_download_plugins () { fi fi export pw_yad="${PW_PLUGINS_PATH}/portable/bin/yad" - export pw_yad_v12_3="${PW_PLUGINS_PATH}/portable/bin/yad_v12_3" + export pw_yad_v13_0="${PW_PLUGINS_PATH}/portable/bin/yad_v13_0" export pw_zstd="${PW_PLUGINS_PATH}/portable/bin/zstd" export pw_7z="${PW_PLUGINS_PATH}/portable/lib/p7zip/7z" return 0 @@ -1134,7 +1132,7 @@ pw_init_db () { export ADD_CB_DBFILE="`echo ${PW_CHECK_DB_FILE} | awk -F'/' '{print $NF}'`!${ADD_CB_DBFILE}" fi done - PORTWINE_DB_FILE="${PORT_SCRIPTS_PATH}/portwine_db"/`"${pw_yad_v12_3}" --text-align=center \ + PORTWINE_DB_FILE="${PORT_SCRIPTS_PATH}/portwine_db"/`"${pw_yad_v13_0}" --text-align=center \ --text "${PW_SELECTION_DB_LOC}" --borders="${YAD_BORDERS}" --form \ --title "Database file selection..." --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --form --separator="" \ --field="DB FILE: :CB" "${ADD_CB_DBFILE}" 2>/dev/null` @@ -1224,18 +1222,18 @@ pw_port_update () { print_info "Scripts version in github = ${scripts_current_ver}" print_info "Scripts version local = ${scripts_install_ver}" if [[ ! -z "${scripts_current_ver}" ]] && [[ "${scripts_current_ver}" -gt "${scripts_install_ver}" ]] ; then - if [[ -f "${PW_PLUGINS_PATH}/portable/bin/yad_v12_3" ]] - then export pw_yad_v12_3="${PW_PLUGINS_PATH}/portable/bin/yad_v12_3" + if [[ -f "${PW_PLUGINS_PATH}/portable/bin/yad_v13_0" ]] + then export pw_yad_v13_0="${PW_PLUGINS_PATH}/portable/bin/yad_v13_0" elif command -v yad &>/dev/null - then local pw_yad_v12_3="yad" - else local pw_yad_v12_3="not_found" + then local pw_yad_v13_0="yad" + else local pw_yad_v13_0="not_found" fi - if [[ "${pw_yad_v12_3}" == "not_found" ]] ; then + if [[ "${pw_yad_v13_0}" == "not_found" ]] ; then xcsd="${scripts_upd4}" else curl -s --list-only "${URL_FOR_CHANGELOG}/${PW_CHANGELOG_FILE}" | tee "${PORT_WINE_TMP_PATH}/curent_var_ver" CHANGLOG_NEWS=`cat "${PORT_WINE_TMP_PATH}/curent_var_ver" | sed "/Scripts version ${scripts_install_ver}/,$ d" | sed '1,/---/ d' ` - xcsd=`"${pw_yad_v12_3}" --title "${scripts_upd2} v.${scripts_current_ver}" --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ + xcsd=`"${pw_yad_v13_0}" --title "${scripts_upd2} v.${scripts_current_ver}" --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ --borders=${YAD_BORDERS} --form --separator='%%%' --width=1200 --height=600 \ --field=":TXT" "${CHANGLOG_NEWS}" \ --field=" ${scripts_upd3} :CB" "${scripts_upd4}!${scripts_upd5}!${scripts_upd6}" 2>/dev/null` @@ -1415,7 +1413,7 @@ pw_find_exe () { done < "${PORT_WINE_TMP_PATH}/tmp_yad_find_exe" OrigIFS="$IFS" && IFS=% - PW_SET_FIND_EXE="$("${pw_yad_v12_3}" --height="300" --width="1000" --list \ + PW_SET_FIND_EXE="$("${pw_yad_v13_0}" --height="300" --width="1000" --list \ --text-align=center --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "Create shortcut for..." \ --text="\n${loc_gui_create_shortcut_for_exe}" --column="path to .exe file:" ${FIND_TO_GUI} 2>/dev/null)" YAD_STATUS="$?" @@ -2276,11 +2274,11 @@ pw_start_cont_xterm () { ######################################################################## yad_info () { print_info "$@" - if [[ ! -f "${pw_yad_v12_3}" ]] ; then - local pw_yad_v12_3="yad" - command -v "${pw_yad_v12_3}" &>/dev/null || fatal "yad not found" + if [[ ! -f "${pw_yad_v13_0}" ]] ; then + local pw_yad_v13_0="yad" + command -v "${pw_yad_v13_0}" &>/dev/null || fatal "yad not found" fi - "${pw_yad_v12_3}" --no-wrap --text "$@" --width=400 --height=50 --borders=15 --title "INFO" \ + "${pw_yad_v13_0}" --no-wrap --text "$@" --width=400 --height=50 --borders=15 --title "INFO" \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/info.png" \ --center --text-align=center --button=OK 2>/dev/null } @@ -2288,35 +2286,35 @@ export -f yad_info yad_error () { print_error "$@" - if [[ ! -f "${pw_yad_v12_3}" ]] ; then - local pw_yad_v12_3="yad" - command -v "${pw_yad_v12_3}" &>/dev/null || fatal "yad not found" + if [[ ! -f "${pw_yad_v13_0}" ]] ; then + local pw_yad_v13_0="yad" + command -v "${pw_yad_v13_0}" &>/dev/null || fatal "yad not found" fi - "${pw_yad_v12_3}" --no-wrap --text "$@" --width=400 --borders=15 --title "ERROR" \ + "${pw_yad_v13_0}" --no-wrap --text "$@" --width=400 --borders=15 --title "ERROR" \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/error.png" \ --center --text-align=center --button=EXIT 2>/dev/null } export -f yad_error yad_error_download () { - if [[ ! -f "${pw_yad_v12_3}" ]] ; then - local pw_yad_v12_3="yad" - command -v "${pw_yad_v12_3}" &>/dev/null || fatal "yad not found" + if [[ ! -f "${pw_yad_v13_0}" ]] ; then + local pw_yad_v13_0="yad" + command -v "${pw_yad_v13_0}" &>/dev/null || fatal "yad not found" fi - "${pw_yad_v12_3}" --text "$loc_gui_error_download" --width=400 --borders=15 --title "$loc_gui_error" \ + "${pw_yad_v13_0}" --text "$loc_gui_error_download" --width=400 --borders=15 --title "$loc_gui_error" \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/download.png" \ --no-wrap --center --text-align=center --button=SKIP:1 --button=REPEAT:0 2>/dev/null [[ "$?" != 0 ]] && return 1 || return 0 } yad_question () { - if [[ ! -f "${pw_yad_v12_3}" ]] ; then - local pw_yad_v12_3="yad" - command -v "${pw_yad_v12_3}" &>/dev/null || fatal "yad not found" + if [[ ! -f "${pw_yad_v13_0}" ]] ; then + local pw_yad_v13_0="yad" + command -v "${pw_yad_v13_0}" &>/dev/null || fatal "yad not found" fi - "${pw_yad_v12_3}" --text "${1}" --width=400 --borders=15 --title "${inst_set}." \ + "${pw_yad_v13_0}" --text "${1}" --width=400 --borders=15 --title "${inst_set}." \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/question.png" \ - --no-wrap --center --text-align=center --button=NO:1 --button=YES:0 2>/dev/null + --no-wrap --center --text-align=center 2>/dev/null [[ "$?" != 0 ]] && return 1 || return 0 } @@ -2358,14 +2356,14 @@ pw_update_pfx_cover_gui () { YAD_UNDECORATED="--undecorated --center" fi - if ! check_start_from_steam && ! pgrep -a yad | grep "yad_v12_3 --notebook --key=$PW_KEY_PROGRESS_BAR_UP" &>/dev/null ; then + if ! check_start_from_steam && ! pgrep -a yad | grep "yad_v13_0 --notebook --key=$PW_KEY_PROGRESS_BAR_UP" &>/dev/null ; then PW_KEY_PROGRESS_BAR_UP=$RANDOM PW_GIF_FILE="${PW_GUI_ICON_PATH}/covers/update_prefix_${update_loc}.gif" PW_GIF_SIZE_X=`file "${PW_GIF_FILE}" | awk '{print $7 + 40}'` PW_GIF_SIZE_Y=`file "${PW_GIF_FILE}" | awk '{print $9 + 80}'` echo "UPDATE PREFIX..." > "${PORT_WINE_TMP_PATH}/update_pfx_log" export PW_TIMER=0 - while read -r line || [[ ! -z `pgrep -a yad | grep "yad_v12_3 --notebook --key=$PW_KEY_PROGRESS_BAR_UP" | awk '{print $1}'` ]] ; do + while read -r line || [[ ! -z `pgrep -a yad | grep "yad_v13_0 --notebook --key=$PW_KEY_PROGRESS_BAR_UP" | awk '{print $1}'` ]] ; do sleep 0.005 if [[ ! -z "${line}" ]] && [[ -z "`echo "${line}" | grep -i "gstreamer"`" ]] \ && [[ -z "`echo "${line}" | grep -i "kerberos"`" ]] \ @@ -2377,10 +2375,10 @@ pw_update_pfx_cover_gui () { sleep 3 PW_TIMER=1 fi - done < "${PORT_WINE_TMP_PATH}/update_pfx_log" | "${pw_yad_v12_3}" --plug=$PW_KEY_PROGRESS_BAR_UP --tabnum=$TAB_N2 --text-info --tail 2>/dev/null & - "${pw_yad_v12_3}" --plug=$PW_KEY_PROGRESS_BAR_UP --tabnum=$TAB_N1 --picture --filename="${PW_GIF_FILE}" --image-on-top 2>/dev/null & + done < "${PORT_WINE_TMP_PATH}/update_pfx_log" | "${pw_yad_v13_0}" --plug=$PW_KEY_PROGRESS_BAR_UP --tabnum=$TAB_N2 --text-info --tail 2>/dev/null & + "${pw_yad_v13_0}" --plug=$PW_KEY_PROGRESS_BAR_UP --tabnum=$TAB_N1 --picture --filename="${PW_GIF_FILE}" --image-on-top 2>/dev/null & - "${pw_yad_v12_3}" --notebook --key="$PW_KEY_PROGRESS_BAR_UP" $TAB_PLACE --no-buttons \ + "${pw_yad_v13_0}" --notebook --key="$PW_KEY_PROGRESS_BAR_UP" $TAB_PLACE --no-buttons \ --auto-close --skip-taskbar --width=$PW_GIF_SIZE_X --height=$PW_GIF_SIZE_Y $YAD_UNDECORATED \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "PortProton" --tab-pos=bottom 2>/dev/null & export PW_YAD_PID_PFX_COVER_UI="$!" @@ -2439,8 +2437,8 @@ open_changelog () { export -f open_changelog pw_tray_icon () { - if [ ! -z "`pgrep -a yad_v12_3 | grep "\--notification" | awk '{print $1}'`" ] ; then - kill -s SIGUSR1 "`pgrep -a yad_v12_3 | grep "\--notification" | awk '{print $1}'`" + if [ ! -z "`pgrep -a yad_v13_0 | grep "\--notification" | awk '{print $1}'`" ] ; then + kill -s SIGUSR1 "`pgrep -a yad_v13_0 | grep "\--notification" | awk '{print $1}'`" fi tray_icon_click () { @@ -2465,7 +2463,7 @@ pw_tray_icon () { export -f tray_icon_click_exit # --window-icon="$PW_GUI_ICON_PATH/portproton_tray.png" \ - "${pw_yad_v12_3}" --notification --no-middle \ + "${pw_yad_v13_0}" --notification --no-middle \ --image="$PW_GUI_ICON_PATH/portproton_tray.png" \ --command="bash -c tray_icon_click" \ --tooltip="PortProton" \ @@ -2521,7 +2519,7 @@ pw_gui_for_edit_db () { edit_db_field_add $@ old_IFS=$IFS IFS="%" - "${pw_yad_v12_3}" --plug=$KEY_EDIT_DB_GUI --tabnum="1" --form --separator=" " --columns=4 ${ADD_CHK_BOX_EDIT_DB} \ + "${pw_yad_v13_0}" --plug=$KEY_EDIT_DB_GUI --tabnum="1" --form --separator=" " --columns=4 ${ADD_CHK_BOX_EDIT_DB} \ 1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_edit_db" 2>/dev/null & IFS=$old_IFS @@ -2533,7 +2531,7 @@ pw_gui_for_edit_db () { # --field="${loc_gui_amd_vulkan_select}!${loc_gui_amd_vulkan_select_help} :CB" "${AMD_VULKAN_VAR}!disabled!amdvlk!amdgpupro!radv!radv_gpl!radv_aco" - "${pw_yad_v12_3}" --plug=$KEY_EDIT_DB_GUI --tabnum="2" --form --separator="%" --columns=1 \ + "${pw_yad_v13_0}" --plug=$KEY_EDIT_DB_GUI --tabnum="2" --form --separator="%" --columns=1 \ --field="${loc_gui_ver_windows}!${loc_gui_ver_windows_help} :CB" "${ADD_WINVER_EDIT_DB}" \ --field="${loc_gui_aut_winetricks}!${loc_gui_aut_winetricks_help} :CBE" "${PW_DLL_INSTALL}!vcrun2019 corefonts lucida" \ --field="${loc_gui_winedllover}!${loc_gui_winedllover_help} :CBE" "${WINEDLLOVERRIDES}!libglesv2=!d3dx9_36,d3dx9_42=n,b;mfc120=b,n" \ @@ -2544,7 +2542,7 @@ pw_gui_for_edit_db () { --field="${loc_gui_gpu_select}!${loc_gui_gpu_select_help} :CB" "${GPU_VAR}!disabled!${GET_GPU_NAMES}" \ --field="${loc_gui_arg_gamescope}!${loc_gui_arg_gamescope_help} :CBE" "\\${GAMESCOPE_ARGS}!-r 60 -F fsr!" 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" 2>/dev/null & - "${pw_yad_v12_3}" --paned --key="$KEY_EDIT_DB_GUI" --title "EDIT_DB" --text-align=center --height="800" \ + "${pw_yad_v13_0}" --paned --key="$KEY_EDIT_DB_GUI" --title "EDIT_DB" --text-align=center --height="650" \ --text "${loc_gui_edit_db} ${PORTWINE_DB}\n ${loc_gui_edit_db_help}" --separator=" " --borders=${YAD_BORDERS} \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ --button="${loc_gui_cancel}"!!"${loc_gui_cancel_help}":1 \ @@ -2817,16 +2815,16 @@ gui_vkBasalt () { fi export old_IFS=$IFS export IFS="%" - "${pw_yad_v12_3}" --plug=$KEY_FX_GUI --tabnum="1" --form --columns=5 --separator=" " \ + "${pw_yad_v13_0}" --plug=$KEY_FX_GUI --tabnum="1" --form --columns=5 --separator=" " \ --text-align=center --text="$loc_gui_vkbasalt_top" \ ${ADD_GUI_FX} 1> "${PORT_WINE_TMP_PATH}/tmp_yad_basalt_set" 2>/dev/null & export IFS="${old_IFS}" - "${pw_yad_v12_3}" --plug=$KEY_FX_GUI --tabnum="2" --separator=" " --form \ + "${pw_yad_v13_0}" --plug=$KEY_FX_GUI --tabnum="2" --separator=" " --form \ --field="AMD FidelityFX - Contrast Adaptive Sharpening"!"$loc_gui_ffx_cas":SCL "${VKBASALT_FFX_CAS_GUI}" \ 1> "${PORT_WINE_TMP_PATH}/tmp_yad_cas_set" 2>/dev/null & - "${pw_yad_v12_3}" --paned --key="$KEY_FX_GUI" --height="650" --title="vkBasalt" --center --borders=${YAD_BORDERS} \ + "${pw_yad_v13_0}" --paned --key="$KEY_FX_GUI" --height="650" --title="vkBasalt" --center --borders=${YAD_BORDERS} \ --separator=" " --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ --button="$loc_gui_cancel"!!"$loc_gui_cancel_help":1 \ --button="$loc_gui_disabled_vkbas"!!"$loc_gui_disabled_vkbas_help":180 \ @@ -2911,16 +2909,16 @@ gui_MangoHud () { export old_IFS=$IFS export IFS="%" - "${pw_yad_v12_3}" --plug=$KEY_MH_GUI --tabnum="1" --form --columns=5 --separator=" " \ + "${pw_yad_v13_0}" --plug=$KEY_MH_GUI --tabnum="1" --form --columns=5 --separator=" " \ --text-align=center --text="$loc_gui_mh_top" \ ${ADD_GUI_MH} 1> "${PORT_WINE_TMP_PATH}/tmp_yad_mh_set" 2>/dev/null & export IFS="${old_IFS}" - "${pw_yad_v12_3}" --plug=$KEY_MH_GUI --tabnum="2" --separator=" " --form \ + "${pw_yad_v13_0}" --plug=$KEY_MH_GUI --tabnum="2" --separator=" " --form \ --field="${loc_gui_mango_fps}!${loc_gui_mango_fps_help} :CB" "${FPS_LIMIT_VAR}!disabled!${GET_REFRESH_RATE}" \ 1> "${PORT_WINE_TMP_PATH}/tmp_yad_mh_fps_limit" 2>/dev/null & - "${pw_yad_v12_3}" --paned --key="$KEY_MH_GUI" --height="650" --title="MangoHud" --center --borders=${YAD_BORDERS} \ + "${pw_yad_v13_0}" --paned --key="$KEY_MH_GUI" --height="650" --title="MangoHud" --center --borders=${YAD_BORDERS} \ --separator=" " --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ --button="$loc_gui_cancel"!!"$loc_gui_cancel_help":1 \ --button="$loc_gui_disabled_mh"!!"$loc_gui_disabled_mh_help":182 \ @@ -3173,19 +3171,19 @@ pw_prefix_manager () { pw_stop_progress_bar KEY_EDIT_MANAGER_GUI=$RANDOM - "${pw_yad_v12_3}" --plug=$KEY_EDIT_MANAGER_GUI --tabnum=1 --list --checklist \ + "${pw_yad_v13_0}" --plug=$KEY_EDIT_MANAGER_GUI --tabnum=1 --list --checklist \ --text="${loc_prefix_manager_comp} \"${PW_PREFIX_NAME}\", ${loc_prefix_manager_wine} \"${PW_WINE_USE}\"" \ --column=set --column=dll --column=info < "${PORT_WINE_TMP_PATH}/dll_list_tmp" 1>> "${PORT_WINE_TMP_PATH}/to_winetricks" 2>/dev/null & - "${pw_yad_v12_3}" --plug=$KEY_EDIT_MANAGER_GUI --tabnum=2 --list --checklist \ + "${pw_yad_v13_0}" --plug=$KEY_EDIT_MANAGER_GUI --tabnum=2 --list --checklist \ --text="${loc_prefix_manager_font} \"${PW_PREFIX_NAME}\", ${loc_prefix_manager_wine} \"${PW_WINE_USE}\"" \ --column=set --column=dll --column=info < "${PORT_WINE_TMP_PATH}/fonts_list_tmp" 1>> "${PORT_WINE_TMP_PATH}/to_winetricks" 2>/dev/null & - "${pw_yad_v12_3}" --plug=$KEY_EDIT_MANAGER_GUI --tabnum=3 --list --checklist \ + "${pw_yad_v13_0}" --plug=$KEY_EDIT_MANAGER_GUI --tabnum=3 --list --checklist \ --text="${loc_prefix_manager_conf} \"${PW_PREFIX_NAME}\"" \ --column=set --column=dll --column=info < "${PORT_WINE_TMP_PATH}/settings_list_tmp" 1>> "${PORT_WINE_TMP_PATH}/to_winetricks" 2>/dev/null & - "${pw_yad_v12_3}" --key=$KEY_EDIT_MANAGER_GUI --notebook --borders=${YAD_BORDERS} --width=900 --height=800 \ + "${pw_yad_v13_0}" --key=$KEY_EDIT_MANAGER_GUI --notebook --borders=${YAD_BORDERS} --width=900 --height=800 \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "$loc_pm" --tab-pos=bottom --tab="$loc_pm_dlls" --tab="$loc_pm_fonts" --tab="$loc_pm_settings" 2>/dev/null YAD_STATUS="$?" if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then @@ -3368,7 +3366,7 @@ portwine_start_debug () { sleep 3 pw_stop_progress_bar_cover unset PW_TIMER - while read -r line || [[ ! -z $(pgrep -a yad | grep "yad_v12_3 --text-info --tail --button="STOP":0 --title="DEBUG"" | awk '{print $1}') ]] ; do + while read -r line || [[ ! -z $(pgrep -a yad | grep "yad_v13_0 --text-info --tail --button="STOP":0 --title="DEBUG"" | awk '{print $1}') ]] ; do sleep 0.005 if [[ ! -z "${line}" ]] && [[ -z "$(echo "${line}" | grep -i "kerberos")" ]] \ && [[ -z "$(echo "${line}" | grep -i "ntlm")" ]] @@ -3379,8 +3377,8 @@ portwine_start_debug () { sleep 3 PW_TIMER=1 fi - done < "${PORT_WINE_PATH}/${portname}.log" | "${pw_yad_v12_3}" --text-info --tail --button="STOP":0 --title="DEBUG" \ - --skip-taskbar --width=800 --height=400 --text "${port_debug}" 2>/dev/null && + done < "${PORT_WINE_PATH}/${portname}.log" | "${pw_yad_v13_0}" --text-info --tail --button="STOP":0 --title="DEBUG" \ + --skip-taskbar --width=800 --height=400 --text "${port_debug}" --window-icon="$PW_GUI_ICON_PATH/portproton.svg" 2>/dev/null && kill_portwine sed -i '/.fx$/d' "${PORT_WINE_PATH}/${portname}.log" sed -i '/HACK_does_openvr_work/d' "${PORT_WINE_PATH}/${portname}.log" @@ -3392,13 +3390,14 @@ portwine_start_debug () { echo "$deb_text" > "${PORT_WINE_PATH}/${portname}.log" "$pw_yad" --title="${portname}.log" --borders=${YAD_BORDERS} --no-buttons --text-align=center \ --text-info --show-uri --wrap --width=1200 --height=550 --uri-color=red \ + --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ --filename="${PORT_WINE_PATH}/${portname}.log" stop_portwine } pw_create_prefix_backup () { cd "$HOME" - PW_PREFIX_TO_BACKUP=$("${pw_yad_v12_3}" --file --directory --borders=${YAD_BORDERS} --width=650 --height=500 --auto-close \ + PW_PREFIX_TO_BACKUP=$("${pw_yad_v13_0}" --file --directory --borders=${YAD_BORDERS} --width=650 --height=500 --auto-close \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "$loc_create_pfx_backup_path" 2>/dev/null ) YAD_STATUS="$?" if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then exit 0 ; fi @@ -3484,7 +3483,7 @@ export -f gui_credits button_click () { [[ ! -z "$1" ]] && echo "$1" > "${PORT_WINE_TMP_PATH}/tmp_yad_form" - if [[ ! -z $(pidof -s yad) ]] || [[ ! -z $(pidof -s yad_v12_3) ]] ; then + if [[ ! -z $(pidof -s yad) ]] || [[ ! -z $(pidof -s yad_v13_0) ]] ; then kill -s SIGUSR1 $(pgrep -a yad | grep "\--key=${KEY} \--notebook" | awk '{print $1}') > /dev/null 2>&1 fi } @@ -3492,7 +3491,7 @@ export -f button_click run_desktop_b_click () { [[ ! -z "$1" ]] && echo "$1" > "${PORT_WINE_TMP_PATH}/tmp_yad_form" - if [[ ! -z $(pidof -s yad) ]] || [[ ! -z $(pidof -s yad_v12_3) ]] ; then + if [[ ! -z $(pidof -s yad) ]] || [[ ! -z $(pidof -s yad_v13_0) ]] ; then kill -s SIGUSR1 $(pgrep -a yad | grep "\--key=${KEY} \--notebook" | awk '{print $1}') > /dev/null 2>&1 fi @@ -3561,7 +3560,7 @@ export -f gui_open_user_conf gui_open_scripts_from_backup () { cd "${PORT_WINE_TMP_PATH}/scripts_backup/" - PW_SCRIPT_FROM_BACKUP=$("${pw_yad_v12_3}" --file --borders=${YAD_BORDERS} --width=650 --height=500 --auto-close \ + PW_SCRIPT_FROM_BACKUP=$("${pw_yad_v13_0}" --file --borders=${YAD_BORDERS} --width=650 --height=500 --auto-close \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "SCRIPTS FROM BACKUP" --file-filter="backup_scripts|scripts_v*.tar.gz" 2>/dev/null ) YAD_STATUS="$?" if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then exit 0 ; fi diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index cb06baf..d7f5f11 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -14,8 +14,8 @@ else if [[ "${update_loc}" == "RUS" || "${update_loc}" == "ENG" ]] && [[ -f "${PORT_WINE_TMP_PATH}/${portname}_loc" ]] ; then echo "" else - [[ ! -f "${pw_yad_v12_3}" ]] && pw_yad_v12_3="yad" - SET_LANG=$("$pw_yad_v12_3" --title "LAUNGUAGE" --text "Select the language:" --list --radiolist \ + [[ ! -f "${pw_yad_v13_0}" ]] && pw_yad_v13_0="yad" + SET_LANG=$("${pw_yad_v13_0}" --title "LAUNGUAGE" --text "Select the language:" --list --radiolist \ --column="Set:" --column "Choose language:" TRUE "RUS" FALSE "ENG" \ --window-icon "$PW_GUI_ICON_PATH/portproton.svg" --width=300 --height=150) SET_LANG="$(echo $SET_LANG | awk -F'|' '{print $2}')" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index eb9191d..bfcd4c2 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -180,7 +180,7 @@ pw_check_and_download_dxvk_and_vkd3d . "${USER_CONF}" kill_portwine -killall -15 yad_v12_3 2>/dev/null +killall -15 yad_v13_0 2>/dev/null kill -TERM `pgrep -a yad | grep ${portname} | head -n 1 | awk '{print $1}'` 2>/dev/null if [[ -f "/usr/bin/portproton" ]] \ @@ -386,10 +386,10 @@ else IFS="$orig_IFS" old_IFS=$IFS && IFS="%" - "${pw_yad_v12_3}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[4]} --form --columns=3 --align-buttons --keep-icon-size --scroll --separator=" " ${PW_GENERATE_BUTTONS} 2>/dev/null & + "${pw_yad_v13_0}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[4]} --form --columns=3 --align-buttons --keep-icon-size --scroll --separator=" " ${PW_GENERATE_BUTTONS} 2>/dev/null & IFS="$orig_IFS" - "${pw_yad_v12_3}" --plug=${KEY} --tabnum=${PW_GUI_SORT_TABS[3]} --form --columns=3 --align-buttons --keep-icon-size --separator=";" \ + "${pw_yad_v13_0}" --plug=${KEY} --tabnum=${PW_GUI_SORT_TABS[3]} --form --columns=3 --align-buttons --keep-icon-size --separator=";" \ --field=" $loc_gui_pw_reinstall_pp"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_pw_reinstall_pp"' \ --field=" $loc_gui_rm_pp"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_rm_portproton"' \ --field=" $loc_gui_upd_pp"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_pw_update"' \ @@ -400,7 +400,7 @@ else --field=" Xterm"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click pw_start_cont_xterm"' \ --field=" $loc_gui_credits"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_credits"' 2>/dev/null & - "${pw_yad_v12_3}" --plug=${KEY} --tabnum=${PW_GUI_SORT_TABS[2]} --form --columns=3 --align-buttons --keep-icon-size --separator=";" \ + "${pw_yad_v13_0}" --plug=${KEY} --tabnum=${PW_GUI_SORT_TABS[2]} --form --columns=3 --align-buttons --keep-icon-size --separator=";" \ --field=" 3D API : :CB" "${PW_DEFAULT_VULKAN_USE}" \ --field=" PREFIX : :CBE" "${PW_ADD_PREFIXES_TO_GUI}" \ --field=" WINE : :CB" "${PW_DEFAULT_WINE_USE}" \ @@ -414,7 +414,7 @@ else --field=" $loc_gui_wine_cmd"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winecmd}":"FBTN" '@bash -c "button_click WINECMD"' \ --field=" $loc_gui_wine_reg"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winereg}":"FBTN" '@bash -c "button_click WINEREG"' 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" & - "${pw_yad_v12_3}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[1]} --form --columns=3 --align-buttons --keep-icon-size --scroll \ + "${pw_yad_v13_0}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[1]} --form --columns=3 --align-buttons --keep-icon-size --scroll \ --field=" Dolphin 5.0"!"$PW_GUI_ICON_PATH/dolphin.png"!"${loc_dolphin}":"FBTN" '@bash -c "button_click PW_DOLPHIN"' \ --field=" MAME"!"$PW_GUI_ICON_PATH/mame.png"!"${loc_mame}":"FBTN" '@bash -c "button_click PW_MAME"' \ --field=" RetroArch"!"$PW_GUI_ICON_PATH/retroarch.png"!"${loc_retroarch}":"FBTN" '@bash -c "button_click PW_RETROARCH"' \ @@ -430,7 +430,7 @@ else --field=" xemu"!"$PW_GUI_ICON_PATH/xemu.png"!"${loc_xemu}":"FBTN" '@bash -c "button_click PW_XEMU"' \ --field=" Demul"!"$PW_GUI_ICON_PATH/demul.png"!"${loc_demul}":"FBTN" '@bash -c "button_click PW_DEMUL"' 2>/dev/null & - "${pw_yad_v12_3}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[0]} --form --columns=3 --align-buttons --keep-icon-size --scroll \ + "${pw_yad_v13_0}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[0]} --form --columns=3 --align-buttons --keep-icon-size --scroll \ --field=" Lesta Game Center"!"$PW_GUI_ICON_PATH/lgc.png"!"":"FBTN" '@bash -c "button_click PW_LGC"' \ --field=" vkPlay Games Center"!"$PW_GUI_ICON_PATH/mygames.png"!"":"FBTN" '@bash -c "button_click PW_VKPLAY"' \ --field=" Battle.net Launcher"!"$PW_GUI_ICON_PATH/battle_net.png"!"":"FBTN" '@bash -c "button_click PW_BATTLE_NET"' \ @@ -472,7 +472,7 @@ else # if command -v wmctrl &>/dev/null ; then # sleep 2 - # while [[ -n $(pgrep -a yad_v12_3 | head -n 1 | awk '{print $1}' 2>/dev/null) ]] ; do + # while [[ -n $(pgrep -a yad_v13_0 | head -n 1 | awk '{print $1}' 2>/dev/null) ]] ; do # sleep 2 # PW_MAIN_GUI_SIZE_TMP="$(wmctrl -lG | grep "PortProton-${install_ver}" | awk '{print $5" "$6}' 2>/dev/null)" # if [[ ! -z "${PW_MAIN_GUI_SIZE_TMP}" ]] ; then @@ -484,7 +484,7 @@ else export START_FROM_PP_GUI=1 if [[ -z "${PW_ALL_DF}" ]] ; then - "${pw_yad_v12_3}" --key=$KEY --notebook --borders=${YAD_BORDERS} --width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons --auto-close \ + "${pw_yad_v13_0}" --key=$KEY --notebook --borders=${YAD_BORDERS} --width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons --auto-close \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "${portname}-${install_ver} (${scripts_install_ver})" \ --tab-pos=bottom --keep-icon-size \ --tab="$loc_mg_autoinstall"!"$PW_GUI_ICON_PATH/separator.png"!"" \ @@ -494,7 +494,7 @@ else --tab="$loc_mg_installed"!"$PW_GUI_ICON_PATH/separator.png"!"" 2>/dev/null YAD_STATUS="$?" else - "${pw_yad_v12_3}" --key=$KEY --notebook --borders=${YAD_BORDERS} --width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons --auto-close \ + "${pw_yad_v13_0}" --key=$KEY --notebook --borders=${YAD_BORDERS} --width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons --auto-close \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "${portname}-${install_ver} (${scripts_install_ver})" \ --tab-pos=bottom --keep-icon-size \ --tab="$loc_mg_installed"!"$PW_GUI_ICON_PATH/separator.png"!"" \ diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 23dec27..5a912a1 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=2271 +#SCRIPTS_NEXT_VERSION=2272 ######################################################################## export PW_MANGOHUD="0" export DEFAULT_MANGOHUD_CONFIG="arch,cpu_mhz,cpu_temp,engine_version,gamemode,gpu_core_clock,gpu_mem_clock,gpu_name,gpu_temp,ram,resolution,vkbasalt,vram,vulkan_driver,wine"