diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 3964257..1c3bed4 100644 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,13 @@ You can help us in the development of the project on the website: https://boosty ----------------------------------------- Changelog: +###Scripts version 2067### +* updated libs to v20 (uses new Steam Runtime Sniper container + updated: MANGOHUD, vkBasalt and additional packages required for PortProton) +* fixed GOG installation +* fixed black screen in Epic Games (NVIDIA + driver v.495) +* fixed canceling file downloads while using AUTOINSTALL +* many small fixes + ###Scripts version 2066### * updated WINE PROTON_GE_7.0RC6-1 (with dxvk and vkd3d) * the wine version from PROTON_GE is used by default (can be replaced with PROTON STEAM by adding to user.conf: export PW_WINE_USE=PROTON_STEAM) diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 35210a6..c668ff6 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -3,12 +3,16 @@ В планах: * wget заменить на curl * добавить выбор и создание различных префиксов (с его наполнением) -* перенести все библиотеки и бинарники добавленые нашим проектом в Portable -* добавить проверку на существоваие каталога wine, если таковой нет, предложить стандартную версию, или скачать другую -* добавить inxi в runtime и его вывод с аргументом -G в log * добавить выбор языка в PortProton и about us * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru ----------------------------------------- +###Scripts version 2067### +* обновлены libs до версии v20 (используется новый контейнер Steam Runtime Sniper + обновлены: MANGOHUD, vkBasalt и доп. пакеты необходимые для PortProton) +* исправлена установка GOG +* исправлен черный экран в Epic Games (NVIDIA + driver v.495) +* исправлена отмена скачивания файлов во время использования AUTOINSTALL +* множество небольших исправлений + ###Scripts version 2066### * обновлен WINE PROTON_GE_7.0RC6-1 (совместно с dxvk и vkd3d) * по умолчанию используется версия wine от PROTON_GE (можно заменить на PROTON STEAM добавив в user.conf: export PW_WINE_USE=PROTON_STEAM) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 73fb8f1..fcb48e2 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -121,12 +121,12 @@ try_download () { wget -O "$2" --read-timeout 300 --retry-connrefused --timeout 15 --tries 3 \ --user-agent="Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" "$1" 2>&1 | \ tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \ - zenity --progress --percentage=0 --title="Download $(basename $1)" --text=Starting... --auto-close --auto-kill --width=500 --height=90 + zenity --progress --percentage=0 --title="Download $(basename $1)" --text=Starting... --auto-close --width=500 --height=90 if [ "${PIPESTATUS[0]}" != 0 ] ; then print_error "failed to download $1. Skipping." try_remove_file "$2" return 1 - else + else return 0 fi try_remove_file "${PORT_WINE_TMP_PATH}/download_log" @@ -137,7 +137,7 @@ try_download_to_path () { wget --directory-prefix="$2" --read-timeout 300 --retry-connrefused --timeout 15 --tries 3 \ --user-agent="Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" "$1" 2>&1 | \ tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \ - zenity --progress --percentage=0 --title="Download $(basename $1)" --text=Starting... --auto-close --auto-kill --width=500 --height=90 + zenity --progress --percentage=0 --title="Download $(basename $1)" --text=Starting... --auto-close --width=500 --height=90 if [ "${PIPESTATUS[0]}" != 0 ] ; then print_error "failed to download $1. Skipping." return 1 @@ -290,7 +290,14 @@ check_user_conf () { } init_wine_ver () { - if [[ ! -z `echo "${PW_WINE_USE}" | grep "^PROTON_STEAM$"` ]] + if [[ -z `ls "${PORT_WINE_PATH}/data/dist/" | grep "${PW_WINE_USE}"` ]] ; then + if [[ ! -z `echo "${PW_WINE_USE}" | grep "PROTON_STEAM"` ]] ; then + export PW_WINE_USE=PROTON_STEAM + else + export PW_WINE_USE=PROTON_GE + fi + fi + if [[ ! -z `echo "${PW_WINE_USE}" | grep "^PROTON_STEAM$"` ]] then export PW_WINE_USE="${PW_PROTON_STEAM_VER}" elif [[ ! -z `echo "${PW_WINE_USE}" | grep "^PROTON_GE$"` ]] then export PW_WINE_USE="${PW_PROTON_GE_VER}" @@ -398,7 +405,7 @@ pw_start_progress_bar_block () { pw_stop_progress_bar () { kill -s SIGUSR1 "$PW_YAD_PID_PROGRESS_BAR_BLOCK" "$PW_YAD_PID_PROGRESS_BAR_CS" \ - "$PW_YAD_PID_PFX_COVER_UI""$PW_YAD_PID_PROGRESS_BAR_COVER""$PW_YAD_PID_TRAY" > /dev/null 2>&1 + "$PW_YAD_PID_PFX_COVER_UI" "$PW_YAD_PID_PROGRESS_BAR_COVER" > /dev/null 2>&1 return 0 } export -f pw_stop_progress_bar @@ -438,8 +445,9 @@ pw_kill_autostart () { while true ; do if [[ -z "`ps aux | grep -m 1 "$1" | grep -v grep | awk '{print $2}'`" && ! -z "`ps aux | grep wrap | grep -v grep | grep -i ${portname} | head -n 1`" ]] ; then echo -e "PID "$1" not found" - sleep 1 + sleep 5 else + sleep 5 kill_portwine break fi @@ -452,7 +460,6 @@ pw_kill_autostart () { export -f pw_kill_autostart stop_portwine () { - add_in_stop_portwine if [ "$int_xneur" = "1" ]; then xneur & fi @@ -463,13 +470,16 @@ stop_portwine () { try_remove_file "${PORT_SCRIPTS_PATH}/0" try_remove_file "${PORT_SCRIPTS_PATH}/1" kill_portwine && - kill -s SIGUSR1 "$PW_YAD_PID_TRAY" > /dev/null 2>&1 if [ ! -z "`ls "${WINEPREFIX}"/drive_c/users/steamuser/Temp/ | head -n 1`" ] ; then chmod -R 755 "${WINEPREFIX}"/drive_c/users/steamuser/Temp/ rm -fr "${WINEPREFIX}"/drive_c/users/steamuser/Temp/* fi try_remove_dir "${PW_WINELIB}/var" find "${WINEPREFIX}/drive_c/" -maxdepth 1 -type f -name "*.tmp" -delete + if [ ! -z "`pgrep -a yad_new | grep "\-\-notification" | awk '{print $1}'`" ] ; then + kill -s SIGUSR1 "`pgrep -a yad_new | grep "\-\-notification" | awk '{print $1}'`" + fi + add_in_stop_portwine > /dev/null 2>&1 kill -n 9 `pgrep -a start.sh | grep '/PortProton/' | awk '{print $1}'` > /dev/null 2>&1 exit 0 } @@ -481,9 +491,9 @@ pw_download_libs () { do try_remove_dir "${PORT_WINE_TMP_PATH}/${RM_LIBS}" done fi - if [[ ! -e "${PW_WINELIB}/runtime/files/bin/yad" || ! -e "${PW_WINELIB}/runtime/files/lib/p7zip/7z" \ - || ! -e "${PW_WINELIB}/runtime/files/bin/vkcube" || ! -e "${PW_WINELIB}/runtime/files/bin/xterm" || \ - -e "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}.tar.xz" ]] ; then + if [[ ! -e "${PW_WINELIB}/portable/bin/yad" || ! -e "${PW_WINELIB}/portable/lib/p7zip/7z" \ + || ! -e "${PW_WINELIB}/runtime/files/bin/vkcube" || -e "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}.tar.xz" ]] ; + then print_info "Download and install libraries..." if try_download "https://github.com/Castro-Fidel/PortWINE/releases/download/libs${PW_LIBS_VER}/libs${PW_LIBS_VER}.tar.xz" "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}.tar.xz" ; then if unpack_tar_xz "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}.tar.xz" "${PORT_WINE_TMP_PATH}/" ; then @@ -497,10 +507,10 @@ pw_download_libs () { zenity_error_download && pw_download_libs fi fi - export pw_yad="${PW_WINELIB}/runtime/files/bin/yad" - export pw_yad_new="${PW_WINELIB}/runtime/files/bin/yad_new" - export pw_zstd="${PW_WINELIB}/runtime/files/bin/zstd" - export pw_7z="${PW_WINELIB}/runtime/files/lib/p7zip/7z" + export pw_yad="${PW_WINELIB}/portable/bin/yad" + export pw_yad_new="${PW_WINELIB}/portable/bin/yad_new" + export pw_zstd="${PW_WINELIB}/portable/bin/zstd" + export pw_7z="${PW_WINELIB}/portable/lib/p7zip/7z" if [ -x "`which xterm 2>/dev/null`" ]; then export SYS_XTERM=`which xterm` export PW_XTERM="${SYS_XTERM} -geometry 159x37 -e" @@ -511,37 +521,22 @@ pw_download_libs () { pw_check_and_download_wine () { [ ! -d "${PORT_WINE_PATH}/data/dist/" ] && create_new_dir "${PORT_WINE_PATH}/data/dist" - if [ "${1}" == "${PW_PROTON_GE_VER}" ] ; then - if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_PROTON_GE_VER}" ] ; then - print_info "Download and install ${PW_PROTON_GE_VER}..." - if try_download "https://github.com/Castro-Fidel/wine_builds/releases/download/${PW_PROTON_GE_VER}/${PW_PROTON_GE_VER}.tar.xz" "${PORT_WINE_PATH}/data/tmp/${PW_PROTON_GE_VER}.tar.xz" ; then - if unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/${PW_PROTON_GE_VER}.tar.xz" "${PORT_WINE_PATH}/data/dist/" ; then - echo "${PW_PROTON_GE_VER}" > "${PORT_WINE_PATH}/data/dist/${PW_PROTON_GE_VER}/version" - try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_PROTON_GE_VER}.tar.xz" - try_remove_dir "${PORT_WINE_PATH}/data/tmp/${PW_PROTON_GE_VER}" - else - try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_PROTON_GE_VER}.tar.xz" - try_remove_dir "${PORT_WINE_PATH}/data/tmp/${PW_PROTON_GE_VER}" - try_remove_dir "${PORT_WINE_PATH}/data/dist/${PW_PROTON_GE_VER}" - - zenity_error_download && pw_check_and_download_wine - fi - else - zenity_error_download && pw_check_and_download_wine - fi - fi + if [[ ! -z `echo "${PW_WINE_USE}" | grep "^PROTON_STEAM$"` ]] + then export PW_WINE_USE="${PW_PROTON_STEAM_VER}" + elif [[ ! -z `echo "${PW_WINE_USE}" | grep "^PROTON_GE$"` ]] + then export PW_WINE_USE="${PW_PROTON_GE_VER}" fi - if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_PROTON_STEAM_VER}" ] ; then - print_info "Download and install ${PW_PROTON_STEAM_VER}..." - if try_download "https://github.com/Castro-Fidel/wine_builds/releases/download/${PW_PROTON_STEAM_VER}/${PW_PROTON_STEAM_VER}.tar.xz" "${PORT_WINE_PATH}/data/tmp/${PW_PROTON_STEAM_VER}.tar.xz" ; then - if unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/${PW_PROTON_STEAM_VER}.tar.xz" "${PORT_WINE_PATH}/data/dist/" ; then - echo "${PW_PROTON_STEAM_VER}" > "${PORT_WINE_PATH}/data/dist/${PW_PROTON_STEAM_VER}/version" - try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_PROTON_STEAM_VER}.tar.xz" - try_remove_dir "${PORT_WINE_PATH}/data/tmp/${PW_PROTON_STEAM_VER}" + if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then + print_info "Download and install ${PW_WINE_USE}..." + if try_download "https://github.com/Castro-Fidel/wine_builds/releases/download/${PW_WINE_USE}/${PW_WINE_USE}.tar.xz" "${PORT_WINE_PATH}/data/tmp/${PW_PROTON_STEAM_VER}.tar.xz" ; then + if unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" "${PORT_WINE_PATH}/data/dist/" ; then + echo "${PW_WINE_USE}" > "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}/version" + try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" + try_remove_dir "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}" else - try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_PROTON_STEAM_VER}.tar.xz" - try_remove_dir "${PORT_WINE_PATH}/data/tmp/${PW_PROTON_STEAM_VER}" - try_remove_dir "${PORT_WINE_PATH}/data/dist/${PW_PROTON_STEAM_VER}" + try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" + try_remove_dir "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}" + try_remove_dir "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" zenity_error_download && pw_check_and_download_wine fi @@ -592,8 +587,6 @@ pw_tray_icon () { export -f pw_tray_winefile tray_icon_click_exit() { pw_stop_progress_bar - kill_portwine - kill -s SIGUSR1 "$PW_YAD_PID_TRAY" > /dev/null 2>&1 stop_portwine } export -f tray_icon_click_exit @@ -607,7 +600,6 @@ pw_tray_icon () { <<< WINEFILE >>>!bash -c pw_tray_winefile!"$PW_GUI_ICON_PATH/port_winefile.png"| \ <<< CHANGE LOG >>>!bash -c open_changelog!"$PW_GUI_ICON_PATH/port_changelog.png"| \ <<< FORCE EXIT >>>!bash -c tray_icon_click_exit!"$PW_GUI_ICON_PATH/port_exit.png"|" & - export PW_YAD_PID_TRAY="$!" } pw_init_db () { diff --git a/data_from_portwine/scripts/portwine_db/EpicGamesLauncher b/data_from_portwine/scripts/portwine_db/EpicGamesLauncher index 65765cb..3e99d5d 100755 --- a/data_from_portwine/scripts/portwine_db/EpicGamesLauncher +++ b/data_from_portwine/scripts/portwine_db/EpicGamesLauncher @@ -4,7 +4,7 @@ #Rating=5 ############################################## #export PW_COMMENT_DB="PortWINE database file for Epic Games Launcher" -export PW_WINE_USE=PROTON_STEAM +export PW_WINE_USE=PROTON_GE export PW_VULKAN_USE=1 -export LAUNCH_PARAMETERS="-opengl -SkipBuildPatchPrereq" +export LAUNCH_PARAMETERS="-SkipBuildPatchPrereq" export PW_DLL_INSTALL="vcrun2010 vcrun2012 vcrun2013 vcrun2019 d3dcompiler_43 d3dcompiler_47 d3dx9" diff --git a/data_from_portwine/scripts/portwine_db/GalaxyClient b/data_from_portwine/scripts/portwine_db/GalaxyClient index a6dcb8a..d57e111 100644 --- a/data_from_portwine/scripts/portwine_db/GalaxyClient +++ b/data_from_portwine/scripts/portwine_db/GalaxyClient @@ -5,9 +5,9 @@ #Rating=1-5 ################################################ export PW_VULKAN_USE=1 -export PW_WINE_USE=PROTON_STEAM -#export WINEDLLOVERRIDES="galaxycommunication.exe=n;libglesv2=" -#export LAUNCH_PARAMETERS="/runWithoutUpdating /deelevated" +export PW_WINE_USE=PROTON_GE +export WINEDLLOVERRIDES="galaxycommunication.exe=n;libglesv2=" +export LAUNCH_PARAMETERS="/runWithoutUpdating /deelevated" export PW_DLL_INSTALL="vcrun2019" add_in_start_portwine () { diff --git a/data_from_portwine/scripts/portwine_db/League of Legends b/data_from_portwine/scripts/portwine_db/League of Legends index 7b2aaf6..36e6854 100755 --- a/data_from_portwine/scripts/portwine_db/League of Legends +++ b/data_from_portwine/scripts/portwine_db/League of Legends @@ -15,9 +15,9 @@ export PW_COMMENT_DB="${TEXT_OPSSL}Dwnload and start League of Legends can take ##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) ##export WINEDLLOVERRIDES="blabla=n,b" export LAUNCH_PARAMETERS=("--launch-product=league_of_legends" "--launch-patchline=live") # Additional launch options -export PW_WINE_USE=WINE_LOL_GE_6.16-5 +export PW_WINE_USE=WINE_LOL_GE_7.0-1 export PW_VULKAN_USE=1 -export PW_MUST_HAVE_DLL="" +export PW_MUST_HAVE_DLL="vcrun2013" ##export PW_USE_DXR10=1 ##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN ##export PW_USE_NVAPI_AND_DLSS=0 @@ -61,7 +61,7 @@ check_download_wine_ver_for_lol check_port_for_lol () { "${pw_yad}" --progress --progress-text="Loading and start League of Legends. Please wait. It can take a long time!" \ --pulsate --no-buttons --undecorated --center --skip-taskbar --image="${PW_GUI_ICON_PATH}/covers/lol_cover.jpg" --image-on-top > /dev/null 2>&1 & - PW_YAD_PID_LOL="$?" + PW_YAD_PID_LOL="$!" process=LeagueClientUx.exe while [[ -z `pidof ${process}` ]] ; do echo "PID ${process} not found" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_GOG b/data_from_portwine/scripts/pw_autoinstall/PW_GOG index b4e892a..5cf8048 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_GOG +++ b/data_from_portwine/scripts/pw_autoinstall/PW_GOG @@ -21,13 +21,13 @@ then # done & pw_start_progress_bar_block "Installing the GOG Galaxy. Please wait..." pw_run "${PW_GOG_WEB_INSTALL_EXE}" - if [ -f "${PW_USER_TEMP}/users/steamuser/Temp/GalaxyInstaller_"*"/remoteconfig.json" ]; then + if [ -f "${PW_USER_TEMP}/users/steamuser/Temp/GalaxyInstaller_"*"/remoteconfig.json" ] ; then export PW_GOG_URL_EXE=$(cat "${PW_USER_TEMP}/users/steamuser/Temp/GalaxyInstaller_"*"/remoteconfig.json" | grep -Eo '[[:alnum:]+\.\_\-\/\=\?\:\-]*.exe' | sed s%'\\'%%g ) fi fi export PW_AUTOINSTALL_EXE="`echo ${PW_USER_TEMP}/${PW_GOG_URL_EXE} | awk -F/ '{print $NF}'`" echo "${PW_AUTOINSTALL_EXE}" -if try_download "${PW_GOG_URL_EXE}" "${PW_AUTOINSTALL_EXE}" +if try_download "${PW_GOG_URL_EXE}" "${PW_AUTOINSTALL_EXE}" then pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/GOG Galaxy/GalaxyClient.exe" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_LOL b/data_from_portwine/scripts/pw_autoinstall/PW_LOL index 1480ace..e2c3f4d 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_LOL +++ b/data_from_portwine/scripts/pw_autoinstall/PW_LOL @@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${WINEPREFIX}/drive_c/live.na.exe" export LAUNCH_PARAMETERS=("--launch-product=league_of_legends" "--launch-patchline=live") export PW_MUST_HAVE_DLL="" export PW_VULKAN_USE=1 -export PW_WINE_USE=WINE_LOL_GE_6.16-5 +export PW_WINE_USE=WINE_LOL_GE_7.0-1 if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then if try_download "https://github.com/Castro-Fidel/wine_builds/releases/download/${PW_WINE_USE}/${PW_WINE_USE}.tar.xz" \ diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index a58c11a..925396d 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -107,9 +107,6 @@ start_portwine () { else export PRESSURE_VESSEL_FILESYSTEMS_RW="${PWRTMRW}" fi done - #HOTFIX portable libs for Debian based OS - [[ ! -d "${PW_WINELIB}/portable/lib/lib/i386-linux-gnu" ]] && ln -s "${PW_WINELIB}/portable/lib/lib32" "${PW_WINELIB}/portable/lib/lib/i386-linux-gnu" - [[ ! -d "${PW_WINELIB}/portable/lib/lib/x86_64-linux-gnu" ]] && ln -s "${PW_WINELIB}/portable/lib/lib" "${PW_WINELIB}/portable/lib/lib/x86_64-linux-gnu" echo "RUNTIME is enabled" fi @@ -511,7 +508,7 @@ else fi unset MANGOHUD MANGOHUD_DLSYM PW_NO_ESYNC PW_NO_FSYNC PW_VULKAN_USE WINEDLLOVERRIDES PW_NO_WRITE_WATCH PW_YAD_SET unset PW_CHECK_AUTOINSTAL PW_VKBASALT_EFFECTS PW_VKBASALT_FFX_CAS PORTWINE_DB PORTWINE_DB_FILE PW_DISABLED_CREATE_DB -unset CHK_SYMLINK_FILE MESA_GL_VERSION_OVERRIDE PATH_TO_GAME +unset CHK_SYMLINK_FILE MESA_GL_VERSION_OVERRIDE PATH_TO_GAME PW_START_DEBUG export portname=PortProton cd "$(dirname "`readlink -f "$0"`")" && export PORT_SCRIPTS_PATH="$(pwd)" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 72de7e0..b6204b2 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -136,13 +136,17 @@ portwine_start_debug () { echo "RAM" >> "${PORT_WINE_PATH}/${portname}.log" free -m >> "${PORT_WINE_PATH}/${portname}.log" echo "-----------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" - echo "Graphic cards and drivers" >> "${PORT_WINE_PATH}/${portname}.log" + echo "Graphic cards and drivers:" >> "${PORT_WINE_PATH}/${portname}.log" + echo 'lspci | grep -i vga:' >> "${PORT_WINE_PATH}/${portname}.log" echo `lspci | grep -i vga` >> "${PORT_WINE_PATH}/${portname}.log" - "${PW_WINELIB}/portable/bin/glxinfo" -B >> "${PORT_WINE_PATH}/${portname}.log" + env LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${PW_WINELIB}/portable/lib/\$LIB" "${PW_WINELIB}/portable/bin/glxinfo" -B >> "${PORT_WINE_PATH}/${portname}.log" + echo " " >> "${PORT_WINE_PATH}/${portname}.log" + echo "inxi -G:" >> "${PORT_WINE_PATH}/${portname}.log" + "${PW_WINELIB}/portable/bin/inxi" -G >> "${PORT_WINE_PATH}/${portname}.log" echo "----------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "Vulkan info device name:" >> "${PORT_WINE_PATH}/${portname}.log" - "${PW_WINELIB}/runtime/files/bin/vulkaninfo" | grep deviceName >> "${PORT_WINE_PATH}/${portname}.log" - "${PW_WINELIB}/runtime/files/bin/vkcube" --c 50 + "${PW_WINELIB}/portable/bin/vulkaninfo" | grep deviceName >> "${PORT_WINE_PATH}/${portname}.log" + "${PW_WINELIB}/portable/bin/vkcube" --c 50 if [ $? -eq 0 ]; then echo "Vulkan cube test passed successfully" >> "${PORT_WINE_PATH}/${portname}.log" else @@ -186,6 +190,7 @@ portwine_start_debug () { "$pw_yad" --title="${portname}.log" --borders=10 --no-buttons --text-align=center \ --text-info --show-uri --wrap --center --width=1200 --height=550 --uri-color=red \ --filename="${PORT_WINE_PATH}/${portname}.log" + stop_portwine } pw_winecfg () { @@ -250,8 +255,6 @@ pw_autoinstall_from_db () { export PW_WINEDBG_DISABLE=1 export PW_NO_WRITE_WATCH=0 export PW_VULKAN_USE=0 - unset PW_WINE_VER - export PW_WINE_USE=${PW_PROTON_STEAM_VER} export PW_NO_FSYNC=1 export PW_NO_ESYNC=1 unset PORTWINE_CREATE_SHORTCUT_NAME diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 2a3144d..469585f 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/bin/bash #Author: Castro-Fidel (PortWINE-Linux.ru) -#SCRIPTS_NEXT_VERSION=2066 +#SCRIPTS_NEXT_VERSION=2067 #PORT_NEXT_VERSION=97 ######################################################################## export PW_MANGOHUD=1 @@ -25,7 +25,7 @@ export PW_MUST_HAVE_DLL="physx mfc42 vcrun2019" export PW_WINEDBG_DISABLE=1 export PW_WINDOWS_VER="10" export WINEARCH="win64" -export PW_LIBS_VER="_v19.2" +export PW_LIBS_VER="_v20" export PORTWINE_URL="http://portwine-linux.ru/" export GDK_BACKEND="x11" export PW_USE_GSTREAMER="1"