From 975c2c3bfbd43d88006c97a92648d0b45c197c4d Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Mon, 12 Jun 2023 16:35:06 +0300 Subject: [PATCH] Scripts version 2201 --- data_from_portwine/changelog_eng | 5 ++ data_from_portwine/changelog_rus | 5 ++ data_from_portwine/scripts/credits | 24 ++++----- data_from_portwine/scripts/functions_helper | 50 +++++++++++-------- data_from_portwine/scripts/lang | 2 +- .../scripts/portwine_db/01_setup_standart | 23 +++++++++ .../portwine_db/{setup => 02_setup_xatab} | 0 .../scripts/portwine_db/03_setup_dotnet | 23 +++++++++ .../portwine_db/WorldOfSeaBattleClient | 3 +- .../scripts/pw_autoinstall/PW_WOSB | 15 +----- data_from_portwine/scripts/runlib | 30 ++++++----- data_from_portwine/scripts/start.sh | 44 ++++++++-------- data_from_portwine/scripts/zen_yad_gui | 20 ++++---- 13 files changed, 151 insertions(+), 93 deletions(-) create mode 100755 data_from_portwine/scripts/portwine_db/01_setup_standart rename data_from_portwine/scripts/portwine_db/{setup => 02_setup_xatab} (100%) create mode 100755 data_from_portwine/scripts/portwine_db/03_setup_dotnet diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 3ff92f44..ade6f8a0 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,11 @@ You can help us in the development of the project on the website: boosty.to/linu ----------------------------------------- Changelog: +###Scripts version 2201### Дата: 12.06.2023 / Update download size: 9 megabytes. +* improved readability of the output when running portproton from the terminal +* fixed the launch of the game World of Sea Battle +* added the selection of the settings file before launching setup.exe + ###Scripts version 2200### Дата: 06.06.2023 / Update download size: 9 megabytes. * updated WINE for League of Legends diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 2f5ae5de..420b81d4 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,11 @@ ----------------------------------------- История изменений: +###Scripts version 2201### Дата: 12.06.2023 / Размер скачиваемого обновления: 9 мегабайт. +* улучшена читаемость вывода при запуске portproton из терминала +* исправлен запуск игры World of Sea Battle +* добавлен выбор файла настроек перед запуском setup.exe + ###Scripts version 2200### Дата: 06.06.2023 / Размер скачиваемого обновления: 9 мегабайт. * обновлен WINE для League of Legends (Для применения изменений требуется снова запустить автоустановку League of Legends) diff --git a/data_from_portwine/scripts/credits b/data_from_portwine/scripts/credits index 6e03bea0..3ab19557 100755 --- a/data_from_portwine/scripts/credits +++ b/data_from_portwine/scripts/credits @@ -15,7 +15,7 @@ https://linux-gaming.ru Авторские права © 2022 Castro-Fidel (linux-gaming.ru) Эта программа поставляется без каких-либо гарантий. -Подробнее см. в Лицензия." & +Подробнее см. в Лицензия." 2>/dev/null & "${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=2 \ @@ -40,7 +40,7 @@ Vano Majukin Сергей 33(46)RUS WelchDragon Vuursteen -" & +" 2>/dev/null & "${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=3 --text-info --scroll <<< " Лицензия Массачусетского технологического института (MIT License) @@ -63,7 +63,7 @@ Vuursteen АВТОРЫ ИЛИ ВЛАДЕЛЕЦ АВТОРСКИХ ПРАВ НЕСУТ ОТВЕТСТВЕННОСТЬ ЗА ЛЮБЫЕ ПРЕТЕНЗИИ, УЩЕРБ ИЛИ ДРУГОЕ. ОТВЕТСТВЕННОСТЬ, БУДУЩАЯ ПО ДОГОВОРУ, ДЕЛИКТУ ИЛИ ИНЫМ ОБРАЗОМ, ВОЗНИКАЮЩАЯ ИЗ ВНЕ ИЛИ В СВЯЗИ С ПРОГРАММНЫМ ОБЕСПЕЧЕНИЕМ ИЛИ ИСПОЛЬЗОВАНИЕМ ИЛИ ДРУГИМИ СДЕЛКАМИ В -ПРОГРАММНОГО ОБЕСПЕЧЕНИЯ." & +ПРОГРАММНОГО ОБЕСПЕЧЕНИЯ." 2>/dev/null & "${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=4 \ --text-info --fontname="Serif bold italic 12" --show-uri --scroll \ @@ -306,7 +306,7 @@ Vuursteen николай гинтов - Список будет дополняться...' & + Список будет дополняться...' 2>/dev/null & "${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=5 --text="Хотите присоединится и помочь в развитии проекта:" \ --title=JOIN --window-icon=group --image=system-config-users --uri-color=red --show-uri \ @@ -318,7 +318,7 @@ VK: https://vk.com/linuxgamingru Стать платным подписчиком: 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" \ --fontname="Serif bold italic 10" --text-info <<< " Сторонние библиотеки, которые используются в PortProton @@ -329,7 +329,7 @@ WINE-PROTON: https://github.com/ValveSoftware/Proton WINE-PROTON-GE: https://github.com/GloriousEggroll/proton-ge-custom/ Kron4ek/Wine: https://github.com/Kron4ek/Wine-Builds YAD: https://github.com/v1cont/yad -ZENITY: https://github.com/GNOME/zenity" & +ZENITY: https://github.com/GNOME/zenity" 2>/dev/null & "${pw_yad_v12_3}" --title "О НАС" --key="${KEY_CREDITS}" --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ --notebook --no-buttons --tab-pos=bottom \ @@ -354,7 +354,7 @@ https://linux-gaming.ru Copyright © 2022 Castro-Fidel (linux-gaming.ru) This program comes with absolutely no warranty. -See the License for details." & +See the License for details." 2>/dev/null & "${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=2 \ @@ -375,7 +375,7 @@ aldiserg an9949an andrey4korop zorn -" & +" 2>/dev/null & "${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=3 --text-info --scroll <<< "MIT License @@ -397,7 +397,7 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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." & +SOFTWARE." 2>/dev/null & "${pw_yad_v12_3}" --plug="${KEY_CREDITS}" --tabnum=4 \ --text-info --fontname="Serif bold italic 12" --show-uri --scroll \ @@ -640,7 +640,7 @@ SOFTWARE." & николай гинтов - The list will be updated...' & + 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:" \ --title=JOIN --window-icon=group --image=system-config-users --uri-color=red --show-uri \ @@ -652,7 +652,7 @@ VK: https://vk.com/linuxgamingru Become a paid subscriber: 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" \ --fontname="Serif bold italic 10" --text-info <<< " Third-party libraries that are used in PortProton @@ -663,7 +663,7 @@ WINE-PROTON: https://github.com/ValveSoftware/Proton WINE-PROTON-GE: https://github.com/GloriousEggroll/proton-ge-custom/ Kron4ek/Wine: https://github.com/Kron4ek/Wine-Builds YAD: https://github.com/v1cont/yad -ZENITY: https://github.com/GNOME/zenity" & +ZENITY: https://github.com/GNOME/zenity" 2>/dev/null & "${pw_yad_v12_3}" --title "ABOUT US" --key="${KEY_CREDITS}" --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 1dd8484d..0188d4ff 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -7,17 +7,27 @@ pw_ping_test () { } print_error () { - echo "ERROR: $@" + printf "\E[31m%s Error: $@ %s\e[0m\n" } export -f print_error +print_warning () { + printf "\E[33m%s Warning: $@ %s\e[0m\n" +} +export -f print_warning + print_info () { - echo "INFO: $@" + printf "\E[36m%s Info: $@ %s\e[0m\n" } export -f print_info +print_debug () { + printf "\E[35m%s Debug: $@ %s\e[0m\n" +} +export -f print_debug + print_var () { - for vp in $@ ; do echo "${vp}=${!vp}" ; done + for vp in $@ ; do print_info "${vp}=${!vp}" ; done } export -f print_var @@ -264,7 +274,7 @@ pw_reinstall_pp () { read -p "Do you want to reinstall PortProton? (Y,y - Yes): " -n 1 -r if [[ ! $REPLY =~ ^[Yy]$ ]] then - echo + echo "" exit 1 fi elif ! gui_question "${port_reinstall}" @@ -277,7 +287,7 @@ pw_reinstall_pp () { try_remove_file "${PORT_WINE_PATH}/data/user.conf" echo 1000 > "${PORT_WINE_TMP_PATH}/scripts_ver" echo - echo "Restarting PP for reinstall files..." + print_info "Restarting PP for reinstall files..." /usr/bin/env bash -c ${pw_full_command_line[*]} & exit 0 } @@ -371,16 +381,16 @@ init_wine_ver () { for mono_gecko_chk in "mono" "gecko" ; do if check_symlink "${WINEDIR}/share/wine/${mono_gecko_chk}" ; then - echo "${WINEDIR}/share/wine/${mono_gecko_chk} is symlink. OK." + print_info "${WINEDIR}/share/wine/${mono_gecko_chk} is symlink. OK." elif [[ -d "${WINEDIR}/share/wine/${mono_gecko_chk}" ]] ; then try_copy_dir "${WINEDIR}/share/wine/${mono_gecko_chk}" "${PORT_WINE_TMP_PATH}" | sszen try_remove_dir "${WINEDIR}/share/wine/${mono_gecko_chk}" try_force_link_dir "${PORT_WINE_TMP_PATH}/${mono_gecko_chk}" "${WINEDIR}"/share/wine/ - echo "Copy ${WINEDIR}/share/wine/${mono_gecko_chk} to tmp and create symlink to ${WINEDIR}/share/wine/. OK." + print_info "Copy ${WINEDIR}/share/wine/${mono_gecko_chk} to tmp and create symlink to ${WINEDIR}/share/wine/. OK." else try_remove_dir "${WINEDIR}/share/wine/${mono_gecko_chk}" try_force_link_dir "${PORT_WINE_TMP_PATH}/${mono_gecko_chk}" "${WINEDIR}"/share/wine - echo "${WINEDIR}/share/wine/${mono_gecko_chk} is broken symlink. Repair... OK." + print_warning "${WINEDIR}/share/wine/${mono_gecko_chk} is broken symlink. Repair... OK." fi done @@ -468,7 +478,7 @@ pw_init_runtime () { else export PRESSURE_VESSEL_FILESYSTEMS_RW="${PWRTMRW}" fi done - echo "RUNTIME is enabled" + print_info "RUNTIME is enabled" } pw_mangohud_check () { @@ -766,10 +776,10 @@ pw_check_and_download_plugins () { pw_init_db () { if [[ ! -z "${portwine_exe}" ]] ; then + try_remove_file "${PORT_SCRIPTS_PATH}/portwine_db/setup" export PORTWINE_DB=`echo "${portwine_exe}" | awk -F '/' 'NF>1{print $NF}' | sed s/".exe"/""/gi` if [[ -f "${portwine_exe}".ppdb ]] && [[ "${PORTWINE_DB}" != "RiotClientServices" ]] ; then export PORTWINE_DB_FILE="${portwine_exe}".ppdb - # sed -i 's/ PP_/ PW_/g' "${PORTWINE_DB_FILE}" . "${PORTWINE_DB_FILE}" if [[ -z "`ls -p "${PORT_WINE_PATH}/prefixes/" | grep -e "^${PW_PREFIX_NAME}/"`" ]] ; then export PW_PREFIX_NAME=`echo "${portwine_exe}" | awk -F"/prefixes/" '{print $2}' | awk -F"/" '{print $1}'` @@ -783,19 +793,17 @@ pw_init_db () { unset ADD_CB_DBFILE for PW_CHECK_DB_FILE in $PW_FIND_DB_FILE ; do if [[ -z "${ADD_CB_DBFILE}" ]] ; then - export ADD_CB_DBFILE="${PW_CHECK_DB_FILE}" + export ADD_CB_DBFILE="`echo ${PW_CHECK_DB_FILE} | awk -F'/' '{print $NF}'`" else - export ADD_CB_DBFILE="${PW_CHECK_DB_FILE}!${ADD_CB_DBFILE}" + export ADD_CB_DBFILE="`echo ${PW_CHECK_DB_FILE} | awk -F'/' '{print $NF}'`!${ADD_CB_DBFILE}" fi done - PORTWINE_DB_FILE=`"${pw_yad_v12_3}" --text-align=center --text "${PW_SELECTION_DB_LOC}" --borders=15 --form \ + PORTWINE_DB_FILE="${PORT_SCRIPTS_PATH}/portwine_db"/`"${pw_yad_v12_3}" --text-align=center --text "${PW_SELECTION_DB_LOC}" --borders=15 --form \ --title "Database file selection..." --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --form --separator="" \ - --field="DB FILE: :CB" "${ADD_CB_DBFILE}"` + --field="DB FILE: :CB" "${ADD_CB_DBFILE}" 2>/dev/null` if [[ "$?" == "1" || "$?" == "252" ]] ; then exit 0 ; fi - # sed -i 's/ PP_/ PW_/g' "${PORTWINE_DB_FILE}" elif [[ `echo "$PW_FIND_DB_FILE" | wc -l` -eq 1 ]] ; then PORTWINE_DB_FILE="${PW_FIND_DB_FILE}" - # sed -i 's/ PP_/ PW_/g' "${PORTWINE_DB_FILE}" fi IFS="$orig_IFS" if [[ -f "${PW_FIND_DB_FILE}" ]] && [[ -z `grep "^export PW_DISABLED_CREATE_DB=1" "${PW_FIND_DB_FILE}"` ]] ; then @@ -844,7 +852,7 @@ pw_port_update () { xcsd=`"${pw_yad_v12_3}" --title "${scripts_upd2} v.${scripts_current_ver}" --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ --borders=3 --form --separator='%%%' --width=1200 --height=600 \ --field=":TXT" "${CHANGLOG_NEWS}" \ - --field=" ${scripts_upd3} :CB" "${scripts_upd4}!${scripts_upd5}!${scripts_upd6}" ` + --field=" ${scripts_upd3} :CB" "${scripts_upd4}!${scripts_upd5}!${scripts_upd6}" 2>/dev/null` YAD_STATUS="$?" if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then exit 0 ; fi xcsd=`echo "${xcsd}" | awk -F'%%%' '{print $2}'` @@ -914,9 +922,9 @@ update_winetricks () { } edit_db_from_gui () { - echo "edit_db_from_gui PORTWINE_DB_FILE=$PORTWINE_DB_FILE" + print_info "edit_db_from_gui PORTWINE_DB_FILE=$PORTWINE_DB_FILE" for mod_db in $@ ; do - echo "${mod_db}=${!mod_db}" + print_info "${mod_db}=${!mod_db}" if [ -z "`cat "${PORTWINE_DB_FILE}" | grep "export ${mod_db}="`" ] ; then echo "export ${mod_db}=\"${!mod_db}\"" >> "${PORTWINE_DB_FILE}" elif [ "`cat "${PORTWINE_DB_FILE}" | grep "export ${mod_db}=" | grep -v "#"`" ] ; then @@ -990,13 +998,13 @@ pw_find_exe () { OrigIFS="$IFS" && IFS=% PW_SET_FIND_EXE="$("${pw_yad_v12_3}" --height="300" --width="1000" --list \ --text-align=center --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "Create shortcut for..." \ - --text="\n${loc_gui_create_shortcut_for_exe}" --column="path to .exe file:" ${FIND_TO_GUI})" + --text="\n${loc_gui_create_shortcut_for_exe}" --column="path to .exe file:" ${FIND_TO_GUI} 2>/dev/null)" YAD_STATUS="$?" print_var YAD_STATUS if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then if [[ -z "${PW_SET_FIND_EXE}" ]] ; then /usr/bin/env bash -c ${pw_full_command_line[*]} & - echo "Restarting..." + print_info "Restarting..." fi exit 0 fi diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index c8c145cc..ab967b10 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -8,7 +8,7 @@ if [[ -f "${PORT_WINE_TMP_PATH}/${portname}_loc" ]] ; then fi if [[ "${update_loc}" == "RUS" || "${update_loc}" == "ENG" ]] && [[ -f "${PORT_WINE_TMP_PATH}/${portname}_loc" ]] ; then - echo "language ${update_loc}" + echo "" else SET_LANG=`zenity --title "LAUNGUAGE" --text "Select the language" --list --radiolist \ --column="Set:" --column "Choose language:" TRUE "RUS" FALSE "ENG" ` diff --git a/data_from_portwine/scripts/portwine_db/01_setup_standart b/data_from_portwine/scripts/portwine_db/01_setup_standart new file mode 100755 index 00000000..6e7e39d9 --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/01_setup_standart @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +#Author: linux-gaming.ru +#setup.exe +#Setup.exe +#SETUP.exe +#.msi +#Rating=5 +################################################ +export PW_DISABLED_CREATE_DB=1 +export PW_ICON_FOR_YAD="${PORT_WINE_PATH}/data/img/setup.png" +export PW_VULKAN_USE=1 +export PW_MANGOHUD=0 +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=1 # Do not use eventfd-based in-process synchronization primitives +export PW_WINEDBG_DISABLE=1 +export PW_USE_GAMEMODE=1 # 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_DLL_INSTALL="" +export WINEDLLOVERRIDES="mscoree,mshtml=" + +add_in_stop_portwine () { + pw_find_exe news +} diff --git a/data_from_portwine/scripts/portwine_db/setup b/data_from_portwine/scripts/portwine_db/02_setup_xatab similarity index 100% rename from data_from_portwine/scripts/portwine_db/setup rename to data_from_portwine/scripts/portwine_db/02_setup_xatab diff --git a/data_from_portwine/scripts/portwine_db/03_setup_dotnet b/data_from_portwine/scripts/portwine_db/03_setup_dotnet new file mode 100755 index 00000000..3fbb0113 --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/03_setup_dotnet @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +#Author: linux-gaming.ru +#setup.exe +#Setup.exe +#SETUP.exe +#.msi +#Rating=5 +################################################ +export PW_DISABLED_CREATE_DB=1 +export PW_ICON_FOR_YAD="${PORT_WINE_PATH}/data/img/setup.png" +export PW_VULKAN_USE=1 +export PW_MANGOHUD=0 +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=1 # Do not use eventfd-based in-process synchronization primitives +export PW_WINEDBG_DISABLE=1 +export PW_USE_GAMEMODE=1 # 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_DLL_INSTALL="" +export PW_PREFIX_NAME="DOTNET" + +add_in_stop_portwine () { + pw_find_exe news +} diff --git a/data_from_portwine/scripts/portwine_db/WorldOfSeaBattleClient b/data_from_portwine/scripts/portwine_db/WorldOfSeaBattleClient index 68dba0f3..175272ae 100755 --- a/data_from_portwine/scripts/portwine_db/WorldOfSeaBattleClient +++ b/data_from_portwine/scripts/portwine_db/WorldOfSeaBattleClient @@ -10,7 +10,6 @@ export PW_WINDOWS_VER="10" export PW_DLL_INSTALL="faudio dotnet48 dotnet20sp2" export WINEDLLOVERRIDES="quartz=b" export LAUNCH_PARAMETERS="" -export PW_WINE_USE="PROTON_GE" export PW_VULKAN_USE="1" export PW_VULKAN_NO_ASYNC="0" export PW_USE_NVAPI_AND_DLSS="0" @@ -40,3 +39,5 @@ export PW_FIX_VIDEO_IN_GAME="0" export PW_USE_AMDVLK_DRIVER="1" export PW_FORCE_LARGE_ADDRESS_AWARE="1" export PW_USE_SHADER_CACHE="1" +export PW_WINE_USE=GE-PROTON7-55 +gui_proton_downloader silent "${PW_WINE_USE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_WOSB b/data_from_portwine/scripts/pw_autoinstall/PW_WOSB index e0aacbf2..5438c4d7 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_WOSB +++ b/data_from_portwine/scripts/pw_autoinstall/PW_WOSB @@ -6,20 +6,9 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/wos_client.exe" export LAUNCH_PARAMETERS=("/VERYSILENT") export PW_DLL_INSTALL="faudio dotnet48" export PW_VULKAN_USE=1 +export PW_WINE_USE=GE-PROTON7-55 +gui_proton_downloader silent "${PW_WINE_USE}" -if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then - if try_download "github.com/Castro-Fidel/wine_builds/releases/download/${PW_WINE_USE}/${PW_WINE_USE}.tar.xz" \ - "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" ; then - if unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" "${PORT_WINE_PATH}/data/dist/" ; then - try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" - UNPACK_STATUS=0 - else - try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" - try_remove_dir "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" - fi - fi - [[ "${UNPACK_STATUS}" != 0 ]] && exit 1 -fi start_portwine if try_download "165311.selcdn.ru/wosb_installer/wos_client.exe" "${PW_AUTOINSTALL_EXE}" then diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 9c084dd2..30c4106d 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -235,7 +235,7 @@ start_portwine () { # else export PW_LD_PRELOAD="${MANGOHUD_LIB_NAME}" # fi systemctl enable --now --user gamemoded &>/dev/null - echo "Gamemod will be launched." + print_info "Gamemod will be launched." else export GAMEMODERUN=0 echo "Gamemod is not installed or disabled in vars script or db file: PW_USE_GAMEMODE=$PW_USE_GAMEMODE" @@ -359,14 +359,14 @@ start_portwine () { fi done fi - echo "Try link wine DXGI by default..." + print_info "Try link wine DXGI by default..." if ! try_force_link_file "${WINEDIR}"/lib/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/syswow64/dxgi.dll" then try_force_link_file "${WINEDIR}"/lib/wine/i386-windows/dxgi.dll "${WINEPREFIX}/drive_c/windows/syswow64/dxgi.dll" fi if ! try_force_link_file "${WINEDIR}"/lib64/wine/fakedlls/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/dxgi.dll" then try_force_link_file "${WINEDIR}"/lib64/wine/x86_64-windows/dxgi.dll "${WINEPREFIX}/drive_c/windows/system32/dxgi.dll" fi - echo "Try link wine d3d filese by default..." + print_info "Try link wine d3d filese by default..." for wine_build_dll in d3d12core d3d12 d3d11 d3d10 d3d10core d3d10_1 d3d9 dxgi ; do if ! try_force_link_file "${WINEDIR}/lib/wine/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_build_dll}.dll" then try_force_link_file "${WINEDIR}/lib/wine/i386-windows/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_build_dll}.dll" @@ -381,12 +381,12 @@ start_portwine () { PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/opengl" if [[ "${PW_VULKAN_USE}" == "0" ]] ; then - echo "Use OpenGL" + print_info "Use OpenGL" export GL_YIELD="NOTHING" export mesa_glthread=true var_winedlloverride_update "d3d11,d3d10,d3d10core,d3d10_1,d3d9,dxgi=b;d3d12,d3d12core=" elif [[ "${PW_VULKAN_USE}" == "3" ]] ; then - echo "Use GALLIUM-NINE (Native DX9 on MESA drivers)" + print_info "Use GALLIUM-NINE (Native DX9 on MESA drivers)" export PW_GALLIUM_NINE_VER="0.8" export PW_GALLIUM_NINE_PATH="${PW_PLUGINS_PATH}/gallium_nine_v.${PW_GALLIUM_NINE_VER}" try_force_link_file "${PW_GALLIUM_NINE_PATH}/lib32/d3d9-nine.dll.so" "${WINEPREFIX}/drive_c/windows/syswow64/d3d9.dll" @@ -416,7 +416,7 @@ start_portwine () { export PW_MANGOHUD=0 export WINE_FULLSCREEN_FSR=0 else - echo "Use VKD3D-PROTON and DXVK (DX 9-12 to vulkan)" + print_info "Use VKD3D-PROTON and DXVK (DX 9-12 to vulkan)" # export WINE_D3D_CONFIG='renderer=vulkan' if [[ "${PW_USE_WINE_DXGI}" == 1 ]] ; then export CP_DXVK_FILES="d3d11 d3d10core d3d9 dxvk_config openvr_api_dxvk" @@ -428,23 +428,23 @@ start_portwine () { if [[ "${PW_VULKAN_USE}" == "1" ]] ; then PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/dxvk-${DXVK_STABLE_VER}" PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_STABLE_VER}" - echo "DXVK v.${DXVK_STABLE_VER} in use" - echo "VKD3D-PROTON v.${VKD3D_STABLE_VER} in use" + print_info "DXVK v.${DXVK_STABLE_VER} in use" + print_info "VKD3D-PROTON v.${VKD3D_STABLE_VER} in use" elif [[ "${PW_VULKAN_USE}" == "2" ]] ; then PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/dxvk-${DXVK_GIT_VER}" PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_GIT_VER}" - echo "DXVK v.${DXVK_GIT_VER} in use" - echo "VKD3D-PROTON v.${VKD3D_GIT_VER} in use" + print_info "DXVK v.${DXVK_GIT_VER} in use" + print_info "VKD3D-PROTON v.${VKD3D_GIT_VER} in use" fi - echo "Try link native DXVK files..." + print_info "Try link native DXVK files..." for wine_dxvk_dll in ${CP_DXVK_FILES} ; do try_force_link_file "${PATH_TO_DXVK_FILES}/x32/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_dxvk_dll}.dll" try_force_link_file "${PATH_TO_DXVK_FILES}/x64/${wine_dxvk_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_dxvk_dll}.dll" [[ "$?" == 0 ]] && var_winedlloverride_update "${wine_dxvk_dll}=n" done - echo "Try link native VKD3D files..." + print_info "Try link native VKD3D files..." for wine_vkd3d_dll in d3d12 d3d12core libvkd3d-shader-1 libvkd3d-1 ; do try_force_link_file "${PATH_TO_VKD3D_FILES}/x86/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll" try_force_link_file "${PATH_TO_VKD3D_FILES}/x64/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/${wine_vkd3d_dll}.dll" @@ -526,7 +526,7 @@ start_portwine () { sed -i '/vcrun2015/d' "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" sed -i '/vcrun2017/d' "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" fi - grep "${need_install_dll_to_pfx}" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" + grep "${need_install_dll_to_pfx}" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" &>/dev/null if [[ "$?" == "1" ]] ; then if [[ -z "${PW_DLL_NEED_INSTALL}" ]] then export PW_DLL_NEED_INSTALL="${need_install_dll_to_pfx}" @@ -594,6 +594,8 @@ pw_run () { echo "WINEDLLOVERRIDES=${WINEDLLOVERRIDES}" >> "${PW_LOG_TO_FILE}" echo "------------------------------------" >> "${PW_LOG_TO_FILE}" echo "Log WINE:" >> "${PW_LOG_TO_FILE}" + echo "" + print_debug "Log from RUNTIME and WINE:" env ${optirun_on} ${PW_GAMEMODERUN_SLR} ${pw_runtime} \ env ${PW_MANGOHUD_SLR} \ PATH="${PATH}" \ @@ -607,6 +609,8 @@ pw_run () { export PW_ADD_TO_ARGS_IN_RUNTIME="--xterm" pw_init_runtime fi + echo "" + print_debug "Log from RUNTIME and WINE:" env ${optirun_on} ${PW_GAMEMODERUN_SLR} ${pw_runtime} \ env ${PW_MANGOHUD_SLR} \ PATH="${PATH}" \ diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index fe7760d0..d747630c 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -200,7 +200,7 @@ portwine_start_debug () { 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}" && + --skip-taskbar --width=800 --height=400 --text "${port_debug}" 2>/dev/null && kill_portwine # sleep 1 && zenity --info --title "DEBUG" --text "${port_debug}" --no-wrap &> /dev/null && kill_portwine sed -i '/.fx$/d' "${PORT_WINE_PATH}/${portname}.log" @@ -292,18 +292,18 @@ pw_prefix_manager () { KEY_EDIT_MANAGER_GUI=$RANDOM "${pw_yad_v12_3}" --plug=$KEY_EDIT_MANAGER_GUI --tabnum=1 --list --checklist \ --text="Select components to install in prefix: \"${PW_PREFIX_NAME}\", using wine: \"${PW_WINE_USE}\"" \ - --column=set --column=dll --column=info < "${PORT_WINE_TMP_PATH}/dll_list_tmp" 1>> "${PORT_WINE_TMP_PATH}/to_winetricks" & + --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 \ --text="Select fonts to install in prefix: \"${PW_PREFIX_NAME}\", using wine: \"${PW_WINE_USE}\"" \ - --column=set --column=dll --column=info < "${PORT_WINE_TMP_PATH}/fonts_list_tmp" 1>> "${PORT_WINE_TMP_PATH}/to_winetricks" & + --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 \ --text="Change config for prefix: \"${PW_PREFIX_NAME}\"" \ - --column=set --column=dll --column=info < "${PORT_WINE_TMP_PATH}/settings_list_tmp" 1>> "${PORT_WINE_TMP_PATH}/to_winetricks" & + --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=3 --width=900 --height=800 \ - --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "PREFIX MANAGER..." --tab-pos=bottom --tab="DLL" --tab="FONTS" --tab="SETTINGS" + --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "PREFIX MANAGER..." --tab-pos=bottom --tab="DLL" --tab="FONTS" --tab="SETTINGS" 2>/dev/null YAD_STATUS="$?" if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then stop_portwine @@ -356,7 +356,7 @@ pw_winetricks () { PW_TIMER=1 fi done < "${PORT_WINE_TMP_PATH}/update_pfx_log" | "${pw_yad_v12_3}" --text-info --tail --no-buttons --title="WINETRICKS" \ - --auto-close --skip-taskbar --width=$PW_GIF_SIZE_X --height=$PW_GIF_SIZE_Y & + --auto-close --skip-taskbar --width=$PW_GIF_SIZE_X --height=$PW_GIF_SIZE_Y 2>/dev/null & "${PORT_WINE_TMP_PATH}/winetricks" -q -r -f &>>"${PORT_WINE_TMP_PATH}/update_pfx_log" try_remove_file "${PORT_WINE_TMP_PATH}/update_pfx_log" kill -s SIGTERM "$(pgrep -a yad_v12_3 | grep "title=WINETRICKS" | awk '{print $1}')" > /dev/null 2>&1 @@ -381,7 +381,7 @@ pw_start_cont_xterm () { pw_create_prefix_backup () { cd "$HOME" PW_PREFIX_TO_BACKUP=$("${pw_yad_v12_3}" --file --directory --borders=3 --width=650 --height=500 --auto-close \ - --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "BACKUP PREFIX TO...") + --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "BACKUP PREFIX TO..." 2>/dev/null ) YAD_STATUS="$?" if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then exit 0 ; fi if [[ -n "$(grep "/${PW_PREFIX_NAME}/" "${PORT_WINE_PATH}"/*.desktop )" ]] ; then @@ -423,7 +423,7 @@ pw_edit_db () { PW_GUI_DISABLED_CS PW_USE_GAMEMODE PW_DX12_DISABLE PW_PRIME_RENDER_OFFLOAD PW_USE_D3D_EXTRAS PW_FIX_VIDEO_IN_GAME \ PW_USE_GSTREAMER PW_FORCE_LARGE_ADDRESS_AWARE PW_USE_SHADER_CACHE PW_USE_WINE_DXGI PW_USE_EAC_AND_BE if [ "$?" == 0 ] ; then - echo "Restarting PP after update ppdb file..." + print_info "Restarting PP after update ppdb file..." /usr/bin/env bash -c ${pw_full_command_line[*]} & exit 0 fi @@ -580,7 +580,7 @@ if [ -n "${portwine_exe}" ]; then --button="${loc_gui_edit_db_start}"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_edit_db} ${PORTWINE_DB}":118 \ --button="${PW_SHORTCUT}" \ --button="${loc_gui_debug}"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_debug}":102 \ - --button="${loc_gui_launch}"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_launch}":106 ) + --button="${loc_gui_launch}"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_launch}":106 2>/dev/null) export PW_YAD_SET="$?" if [[ "$PW_YAD_SET" == "1" || "$PW_YAD_SET" == "252" ]] ; then exit 0 ; fi export VULKAN_MOD=$(echo "${OUTPUT_START}" | grep \;\; | awk -F";" '{print $1}') @@ -610,7 +610,7 @@ else fi PW_EXEC_FROM_DESKTOP="$(cat "${PORT_WINE_PATH}/${PW_YAD_SET//¬/" "}" | grep Exec | head -n 1 | awk -F"=env " '{print $2}')" - echo "Restarting PP after choose desktop file..." + print_info "Restarting PP after choose desktop file..." # stop_portwine /usr/bin/env bash -c "${PW_EXEC_FROM_DESKTOP}" & exit 0 @@ -620,7 +620,7 @@ else gui_clear_pfx () { if gui_question "${port_clear_pfx}" ; then pw_clear_pfx - echo "Restarting PP after clearing prefix..." + print_info "Restarting PP after clearing prefix..." /usr/bin/env bash -c ${pw_full_command_line[*]} & exit 0 fi @@ -641,14 +641,14 @@ else gui_pw_update () { try_remove_file "${PORT_WINE_TMP_PATH}/scripts_update_notifier" - echo "Restarting PP for check update..." + print_info "Restarting PP for check update..." /usr/bin/env bash -c ${pw_full_command_line[*]} & exit 0 } change_loc () { try_remove_file "${PORT_WINE_TMP_PATH}/${portname}_loc" - echo "Restarting PP for change language..." + print_info "Restarting PP for change language..." /usr/bin/env bash -c ${pw_full_command_line[*]} & exit 0 } @@ -667,12 +667,12 @@ else gui_open_scripts_from_backup () { cd "${PORT_WINE_TMP_PATH}/scripts_backup/" PW_SCRIPT_FROM_BACKUP=$("${pw_yad_v12_3}" --file --borders=3 --width=650 --height=500 --auto-close \ - --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "SCRIPTS FROM BACKUP" --file-filter="backup_scripts|scripts_v*.tar.gz") + --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --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 unpack_tar_gz "$PW_SCRIPT_FROM_BACKUP" "${PORT_WINE_PATH}/data/" echo "0" > "${PORT_WINE_TMP_PATH}/scripts_update_notifier" - echo "Restarting PP after backup..." + print_info "Restarting PP after backup..." /usr/bin/env bash -c ${pw_full_command_line[*]} & exit 0 } @@ -698,7 +698,7 @@ else done 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} & + "${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 & IFS="$orig_IFS" "${pw_yad_v12_3}" --plug=${KEY} --tabnum=${PW_GUI_SORT_TABS[3]} --form --columns=3 --align-buttons --keep-icon-size --separator=";" \ @@ -710,7 +710,7 @@ else --field=" $loc_gui_edit_usc"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_open_user_conf"' \ --field=" $loc_gui_scripts_fb"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_open_scripts_from_backup"' \ --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"' & + --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=";" \ --field=" 3D API : :CB" "${loc_gui_vulkan_stable}!${loc_gui_vulkan_git}!${loc_gui_open_gl}!${loc_gui_gallium_nine}" \ @@ -724,7 +724,7 @@ else --field=' WINETRICKS'!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winetricks}":"FBTN" '@bash -c "button_click WINETRICKS"' \ --field=" WINE UNINSTALLER"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_wine_uninstaller"' \ --field=" CLEAR PREFIX"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_clear_pfx"' \ - --field=" CREATE PFX BACKUP"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click pw_create_prefix_backup"' &> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" & + --field=" CREATE PFX BACKUP"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click pw_create_prefix_backup"' 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 \ --field=" Dolphin 5.0"!"$PW_GUI_ICON_PATH/dolphin.png"!"":"FBTN" '@bash -c "button_click PW_DOLPHIN"' \ @@ -743,7 +743,7 @@ else --field=" FCEUX"!"$PW_GUI_ICON_PATH/fceux.png"!"":"FBTN" '@bash -c "button_click PW_FCEUX"' \ --field=" xemu"!"$PW_GUI_ICON_PATH/xemu.png"!"":"FBTN" '@bash -c "button_click PW_XEMU"' \ --field=" Demul"!"$PW_GUI_ICON_PATH/demul.png"!"":"FBTN" '@bash -c "button_click PW_DEMUL"' \ - --field=" Rpcs3"!"$PW_GUI_ICON_PATH/rpcs3.png"!"":"FBTN" '@bash -c "button_click PW_RPCS3"' & + --field=" Rpcs3"!"$PW_GUI_ICON_PATH/rpcs3.png"!"":"FBTN" '@bash -c "button_click PW_RPCS3"' 2>/dev/null & "${pw_yad_v12_3}" --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"' \ @@ -772,7 +772,7 @@ else --field=" OSU"!"$PW_GUI_ICON_PATH/osu.png"!"":"FBTN" '@bash -c "button_click PW_OSU"' \ --field=" ITCH.IO"!"$PW_GUI_ICON_PATH/itch.png"!"":"FBTN" '@bash -c "button_click PW_ITCH"' \ --field=" Steam (unstable)"!"$PW_GUI_ICON_PATH/steam.png"!"":"FBTN" '@bash -c "button_click PW_STEAM"' \ - --field=" Path of Exile"!"$PW_GUI_ICON_PATH/poe.png"!"":"FBTN" '@bash -c "button_click PW_POE"' & + --field=" Path of Exile"!"$PW_GUI_ICON_PATH/poe.png"!"":"FBTN" '@bash -c "button_click PW_POE"' 2>/dev/null & # --field=" Electronic Arts App"!"$PW_GUI_ICON_PATH/eaapp.png"!"":"FBTN" '@bash -c "button_click PW_EAAPP"' # --field=" Genshin Impact"!"$PW_GUI_ICON_PATH/genshinimpact.png"!"":"FBTN" '@bash -c "button_click PW_GENSHIN_IMPACT"' @@ -800,7 +800,7 @@ else --tab="$loc_mg_emulators"!"$PW_GUI_ICON_PATH/separator.png"!"" \ --tab="$loc_mg_wine_settings"!"$PW_GUI_ICON_PATH/separator.png"!"" \ --tab="$loc_mg_portproton_settings"!"$PW_GUI_ICON_PATH/separator.png"!"" \ - --tab="$loc_mg_installed"!"$PW_GUI_ICON_PATH/separator.png"!"" + --tab="$loc_mg_installed"!"$PW_GUI_ICON_PATH/separator.png"!"" 2>/dev/null YAD_STATUS="$?" else "${pw_yad_v12_3}" --key=$KEY --notebook --borders=3 --width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons --auto-close \ @@ -810,7 +810,7 @@ else --tab="$loc_mg_autoinstall"!"$PW_GUI_ICON_PATH/separator.png"!"" \ --tab="$loc_mg_emulators"!"$PW_GUI_ICON_PATH/separator.png"!"" \ --tab="$loc_mg_wine_settings"!"$PW_GUI_ICON_PATH/separator.png"!"" \ - --tab="$loc_mg_portproton_settings"!"$PW_GUI_ICON_PATH/separator.png"!"" + --tab="$loc_mg_portproton_settings"!"$PW_GUI_ICON_PATH/separator.png"!"" 2>/dev/null YAD_STATUS="$?" fi diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui index fd2c1642..ad3bee7c 100755 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -62,11 +62,11 @@ 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 --tabnum="2" --text-info --tail & - "${pw_yad_v12_3}" --plug=$PW_KEY_PROGRESS_BAR --tabnum="1" --picture --filename="${PW_GIF_FILE}" --image-on-top & + done < "${PORT_WINE_TMP_PATH}/update_pfx_log" | "${pw_yad_v12_3}" --plug=$PW_KEY_PROGRESS_BAR --tabnum="2" --text-info --tail 2>/dev/null & + "${pw_yad_v12_3}" --plug=$PW_KEY_PROGRESS_BAR --tabnum="1" --picture --filename="${PW_GIF_FILE}" --image-on-top 2>/dev/null & "${pw_yad_v12_3}" --notebook --key="$PW_KEY_PROGRESS_BAR" --tab=LOGO --tab=TERMINAL --no-buttons --undecorated \ - --center --auto-close --skip-taskbar --width=$PW_GIF_SIZE_X --height=$PW_GIF_SIZE_Y --tab-pos=bottom & + --center --auto-close --skip-taskbar --width=$PW_GIF_SIZE_X --height=$PW_GIF_SIZE_Y --tab-pos=bottom 2>/dev/null & export PW_YAD_PID_PFX_COVER_UI="$!" return 0 } @@ -143,7 +143,7 @@ pw_tray_icon () { ${loc_tray_winefile}!bash -c pw_tray_winefile!"$PW_GUI_ICON_PATH/port_winefile.png"|| \ ${loc_tray_tascmng}!bash -c pw_tray_taskmgr!"$PW_GUI_ICON_PATH/port_winefile.png"|| \ ${loc_tray_cangelog}!bash -c open_changelog!"$PW_GUI_ICON_PATH/port_changelog.png"|| \ - ${loc_tray_force_exit} !bash -c tray_icon_click_exit!"$PW_GUI_ICON_PATH/port_exit.png"||" & + ${loc_tray_force_exit} !bash -c tray_icon_click_exit!"$PW_GUI_ICON_PATH/port_exit.png"||" 2>/dev/null & return 0 } @@ -172,7 +172,7 @@ pw_gui_for_edit_db () { old_IFS=$IFS IFS="%" "${pw_yad_v12_3}" --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" & + 1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_edit_db" 2>/dev/null & IFS=$old_IFS case ${PW_WINDOWS_VER} in @@ -187,14 +187,14 @@ pw_gui_for_edit_db () { --field=":LBL" "" \ --field="${loc_gui_arg_exe}!${loc_gui_arg_exe_help} :CBE" "\\${LAUNCH_PARAMETERS[@]}!-dx11 -skipintro 1" \ --field=":LBL" "" \ - --field="${loc_gui_mango_fps}!${loc_gui_mango_fps_help} :SCL" ${FPS_LIMIT_VAR} 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" & + --field="${loc_gui_mango_fps}!${loc_gui_mango_fps_help} :SCL" ${FPS_LIMIT_VAR} 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="650" \ --text "${loc_gui_edit_db} ${PORTWINE_DB}\n ${loc_gui_edit_db_help}" --separator=" " --borders=3 \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ --button="${loc_gui_cancel}"!!"${loc_gui_cancel_help}":1 \ --button="${loc_gui_open_db}"!!"${loc_gui_open_db_help}":150 \ - --button="${loc_gui_save_changes}"!!"${loc_gui_save_changes_help}":0 + --button="${loc_gui_save_changes}"!!"${loc_gui_save_changes_help}":0 2>/dev/null YAD_STATUS="$?" case "$YAD_STATUS" in 1) /usr/bin/env bash -c ${pw_full_command_line[*]} & exit 0 ;; @@ -407,18 +407,18 @@ gui_vkBasalt () { export IFS="%" "${pw_yad_v12_3}" --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" & + ${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 \ --field="AMD FidelityFX - Contrast Adaptive Sharpening"!"$loc_gui_ffx_cas":SCL "${VKBASALT_FFX_CAS_GUI}" \ - 1> "${PORT_WINE_TMP_PATH}/tmp_yad_cas_set" & + 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=3 \ --separator=" " --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ --button="$loc_gui_cancel"!!"$loc_gui_cancel_help":1 \ --button="$loc_gui_disabled_vkbas"!!"$loc_gui_disabled_vkbas_help":180 \ - --button="$loc_gui_save_changes"!!"$loc_gui_save_changes_help":182 + --button="$loc_gui_save_changes"!!"$loc_gui_save_changes_help":182 2>/dev/null YAD_VKBASALT_STATUS="$?" case "${YAD_VKBASALT_STATUS}" in 1|252)