Scripts version 2105

data_from_portwine/changelog_eng

@@ -2,6 +2,13 @@ You can help us in the development of the project on the website: boosty.to/port
 -----------------------------------------
 Changelog:
 
+###Scripts version 2105###
+* updated "PROTON_STEAM" to version 7.0-2
+* updated "PROTON_GE" to version 7-16
+* updated "WINE_LOL_GE" to version 7.0-2 + installation and startup scripts (game client launch is accelerated)
+* removed "Bethesda.net Launcher" from AUTOINSTALL (because it moved to STEAM)
+* improved prefix image creation and unpacking functions
+
 ###Scripts version 2104###
 * HOTFIX - download and update winetricks
 * when creating a log, all d3dx* and d3dcomp* were removed for readability

data_from_portwine/changelog_rus

@@ -2,6 +2,14 @@
 -----------------------------------------
 История изменений:
 
+###Scripts version 2105###
+* обновлен "PROTON_STEAM" до версии 7.0-2
+* обновлен "PROTON_GE" до версии 7-16
+* обновлен "WINE_LOL_GE" до версии 7.0-2 + скрипы установки и запуска (ускорен запуск клиента игры)
+* удален "Bethesda.net Launcher" из AUTOINSTALL (из за его переезда в STEAM)
+* улучшены функции создания образа префикса и его распаковки 
+* улучшение локализации
+
 ###Scripts version 2104###
 * HOTFIX - скачивание и обновление winetricks
 * при создании лога убраны все d3dx* и d3dcomp* для удобства чтения

data_from_portwine/scripts/functions_helper

@@ -110,7 +110,7 @@ try_download () {
     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 --width=500 --height=90
     if [ "${PIPESTATUS[0]}" != 0 ] ; then
-        print_error "failed to download $1. Skipping."
+        print_error "Failed to download $1."
         try_remove_file "$2"
         return 1 
     else
@@ -126,7 +126,7 @@ try_download_to_path () {
     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 --width=500 --height=90
     if [ "${PIPESTATUS[0]}" != 0 ] ; then
-        print_error "failed to download $1. Skipping."
+        print_error "Failed to download $1."
         return 1 
     else 
         return 0
@@ -137,7 +137,7 @@ try_download_silent () {
     wget -O "$2" --read-timeout 300 --retry-connrefused --timeout 15 --tries 3 \
     --user-agent="Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" "$1"
     if [ "${PIPESTATUS[0]}" != 0 ] ; then
-        print_error "failed to download $1. Skipping."
+        print_error "Failed to download $1. Skipping."
         try_remove_file "$2"
         return 1 
     else 
@@ -331,25 +331,9 @@ init_wine_ver () {
 }
 
 pw_init_runtime () {
-    # PW_OS_LIB='opensuse|centos|rosa|altlinux|astra|redos|fedora|gentoo'
-    # if [[ ! -z "`cat /etc/*-release | grep -iE "${PW_OS_LIB}"`" ]] ; then
-    #     if check_symlink "${PW_WINELIB}/portable/lib/lib64" ; then
-    #         rm -fr "${PW_WINELIB}/portable/lib/lib64"
-    #     fi
-    #     if [[ ! -d "${PW_WINELIB}/portable/lib/lib64" ]] ; then
-    #         mv -f "${PW_WINELIB}/portable/lib/lib" "${PW_WINELIB}/portable/lib/lib64"
-    #     fi
-    #     if [[ ! -d "${PW_WINELIB}/portable/lib/lib" ]] ; then
-    #         ln -s "${PW_WINELIB}/portable/lib/lib32" "${PW_WINELIB}/portable/lib/lib"
-    #     fi
-    # fi
 
     PW_PV_OVERRIDES="/usr/lib/pressure-vessel/overrides/lib" 
-    if [[ ! -z "${LD_LIBRARY_PATH}" ]] ; then
+    export PW_LD_LIBRARY_PATH="${WINEDIR}/lib64:${WINEDIR}/lib:${PW_WINELIB}/portable/lib/lib64:${PW_WINELIB}/portable/lib/lib32:${PW_PV_OVERRIDES}/x86_64-linux-gnu/aliases:${PW_PV_OVERRIDES}/i386-linux-gnu/aliases"
-        export PW_LD_LIBRARY_PATH="${WINEDIR}/lib64:${WINEDIR}/lib:${PW_WINELIB}/portable/lib/lib64:${PW_WINELIB}/portable/lib/lib32:${PW_PV_OVERRIDES}/x86_64-linux-gnu/aliases:${PW_PV_OVERRIDES}/i386-linux-gnu/aliases:${LD_LIBRARY_PATH}"
-    else
-        export PW_LD_LIBRARY_PATH="${WINEDIR}/lib64:${WINEDIR}/lib:${PW_WINELIB}/portable/lib/lib64:${PW_WINELIB}/portable/lib/lib32:${PW_PV_OVERRIDES}/x86_64-linux-gnu/aliases:${PW_PV_OVERRIDES}/i386-linux-gnu/aliases"
-    fi 
 
     export PW_VK_LAYER_PATH="${PW_WINELIB}/portable/share/vulkan/implicit_layer.d"
 
@@ -522,24 +506,23 @@ kill_portwine () {
 export -f kill_portwine
 
 pw_kill_autostart () {
-    if [ "$PW_USE_RUNTIME" != 1 ]
+    sleep 5
-    then print_info "PW_USE_RUNTIME=$PW_USE_RUNTIME"
+    
-    else
+    while true ; do
-        sleep 5
+        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
-        while true ; do
+            echo -e "PID "$1" not found"
-            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
+            sleep 5
-                echo -e "PID "$1" not found"
+        else
-                sleep 5
+            sleep 5
-            else
+            kill_portwine 
-                sleep 5
+            break
-                kill_portwine 
+        fi
-                break
+    done
-            fi
+
-        done
-    fi
     if [[ ! -z "`ls "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/drive_c/ | grep -m 1 ".tmp"`" ]] ; then
         rm -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/drive_c/*.tmp
     fi
+
     return 0
 }
 export -f pw_kill_autostart
@@ -558,9 +541,9 @@ stop_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_new | grep "\-\-notification" | awk '{print $1}'`" ] ; then
-        kill -s SIGUSR1 "`pgrep -a yad_new | grep "\-\-notification" | awk '{print $1}'`"
+        kill -s SIGUSR1 "`pgrep -a yad_new | grep "\-\-notification" | awk '{print $1}'`" 2>/dev/null
     fi
-    add_in_stop_portwine > /dev/null 2>&1
+    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_new &>/dev/null
     exit 0
@@ -660,9 +643,9 @@ pw_check_and_download_plugins () {
 }
 
 pw_init_db () {
-    if [ ! -z "${portwine_exe}" ]; then
+    if [[ ! -z "${portwine_exe}" ]] ; then
         export PORTWINE_DB=`echo "${portwine_exe}" | awk -F '/' 'NF>1{print $NF}' | sed s/".exe"/""/gi`
-        if [[ -f "${portwine_exe}".ppdb ]] ; then
+        if [[ -f "${portwine_exe}".ppdb ]] && [[ "${PORTWINE_DB}" != "RiotClientServices" ]] ; then
             export PORTWINE_DB_FILE="${portwine_exe}".ppdb
             . "${PORTWINE_DB_FILE}"
             if [[ -z "`ls -p "${PORT_WINE_PATH}/prefixes/" | grep -e "^${PW_PREFIX_NAME}/"`" ]] ; then
@@ -692,8 +675,8 @@ pw_init_db () {
             IFS="$orig_IFS"
             if [[ -f "${PW_FIND_DB_FILE}" ]] && [[ -z `grep "^export PW_DISABLED_CREATE_DB=1" "${PW_FIND_DB_FILE}"` ]] ; then
                 try_copy_file "${PW_FIND_DB_FILE}" "${portwine_exe}".ppdb
+                export PORTWINE_DB_FILE="${portwine_exe}".ppdb
             fi
-            export PORTWINE_DB_FILE="${portwine_exe}".ppdb
             if [[ ! -z `echo "${portwine_exe}" | grep "/data/prefixes/"` ]] && \
                 [[ -z `echo "${portwine_exe}" | grep "/data/prefixes/DEFAULT/"` ]]
             then 
@@ -773,7 +756,7 @@ pw_port_update () {
                 "${scripts_upd5}")
                     echo " " ;;
                 "${scripts_upd6}")
-                echo "0" > "${PORT_WINE_TMP_PATH}/scripts_update_notifier" ;;
+                    echo "0" > "${PORT_WINE_TMP_PATH}/scripts_update_notifier" ;;
             esac
         fi
     fi

data_from_portwine/scripts/lang

@@ -6,6 +6,24 @@ export update_loc=${update_loc}
 
 if [ "${update_loc}" = "RUS" ]
 then
+
+    export loc_gui_rm_pp="Удалить PORTPROTON"
+    export loc_gui_upd_pp="Проверить обновления"
+    export loc_gui_changelog="История изменений"
+    export loc_gui_edit_usc="Редактировать USER.CONF"
+    export loc_gui_scripts_fb="Откатить версию скриптов"
+    export loc_gui_about_us="О нас"
+
+	export loc_tray_winefile="Файловый менеджер WINE"
+	export loc_tray_tascmng="Диспетчер задач WINE"
+	export loc_tray_cangelog="История изменений"
+	export loc_tray_force_exit="Завершить работу PortProton"
+
+	export loc_mg_autoinstall="АВТОУСТАНОВКА"
+	export loc_mg_emulators="ЭМУЛЯТОРЫ"
+	export loc_mg_wine_settings="НАСТРОЙКИ WINE"
+	export loc_mg_portproton_settings="НАСТРОЙКИ PORTPROTON"
+
 	export PW_CHANGELOG_FILE="changelog_rus"
 	export PW_SELECTION_DB_LOC="Найдено более одного DB файла для запускаемого приложения.\nВыберите необходимый, или перед следующим запуском удалите лишний DB файл.\n"
 
@@ -52,11 +70,11 @@ then
 	export loc_delete_shortcut="Удалить ярлык для запускаемого файла."
 	export loc_debug="Запуск c созданием .log файла в корне ${portname}"
 	export loc_launch="Запустить файл..."
-	export loc_winecfg="Запустить winecfg для редактирования настроек префикса ${portname}"
+	export loc_winecfg="Запустить winecfg для редактирования настроек выбранного префикса"
 	export loc_winefile="Запустить файловый менеждер встроенный в wine"
     export loc_winecmd="Запустить командную строку wine"
-	export loc_winereg="Запустить редактор реестра префикса ${portname}"
+	export loc_winereg="Запустить редактор реестра выбранного префикса"
-    export loc_winetricks="Запустить winetricks для установки доп. библиотек в префикс ${portname}"
+    export loc_winetricks="Запустить префикс менеджер для установки доп. библиотек в выбранный префикс"
 	export loc_edit_db="Изменить файл настроек для"
 	export loc_download_other_wine="Открыть меню для скачивания других версий WINE-PROTON"
 
@@ -117,6 +135,24 @@ then
 
 elif [ "${update_loc}" = "ENG" ]
 then
+
+    export loc_gui_rm_pp="REMOVE PORTPROTON"
+    export loc_gui_upd_pp="UPDATE PORTPROTON"
+    export loc_gui_changelog="CHANGELOG"
+    export loc_gui_edit_usc="EDIT USER.CONF"
+    export loc_gui_scripts_fb="SCRIPTS FROM BACKUP"
+    export loc_gui_about_us="ABOUT PORTPROTON"
+
+	export loc_tray_winefile="WINEFILE"
+	export loc_tray_tascmng="TASKMNR"
+	export loc_tray_cangelog="CHANGE  LOG"
+	export loc_tray_force_exit="FORCE  EXIT"
+
+	export loc_mg_autoinstall="AUTOINSTALL"
+	export loc_mg_emulators="EMULATORS"
+	export loc_mg_wine_settings="WINE SETTINGS"
+	export loc_mg_portproton_settings="PORTPROTON SETTINGS"
+
 	export PW_CHANGELOG_FILE="changelog_eng"
 	export PW_SELECTION_DB_LOC="More than one DB file found for the application being launched.\nSelect the required one, or delete the extra DB file before the next run.\n"
 

data_from_portwine/scripts/portwine_db/League of Legends

@@ -11,35 +11,15 @@
 export TEXT_OPSSL=""
 [[ -z `which openssl` ]] && export TEXT_OPSSL="Install openssl in your system!!!\n"
 export PW_COMMENT_DB="${TEXT_OPSSL}Dwnload and start League of Legends can take a long time"
-##export PW_WINDOWS_VER=10                        # Set windows version 10, 7 or XP
-##export PW_DLL_INSTALL="vcrun2017"               # Install DDL in port prefix (used winetricks)
 export WINEDLLOVERRIDES="mscoree,mshtml="
-export LAUNCH_PARAMETERS="--launch-product=league_of_legends --launch-patchline=live"              # Additional launch options
+# export LAUNCH_PARAMETERS="--launch-product=league_of_legends --launch-patchline=live"              # Additional launch options
-export PW_WINE_USE=WINE_LOL_GE_7.0-1
+export PW_WINE_USE=WINE_LOL_GE_7.0-2
 export PW_VULKAN_USE=1
 export PW_MUST_HAVE_DLL=""
 export PW_PREFIX_NAME="LEAGUE_OF_LEGENDS"
-##export PW_USE_DXR10=1
+export PW_NO_FSYNC=1
-##export PW_VULKAN_NO_ASYNC=1                     # Disabled ASYNC for VULKAN
+export PW_NO_ESYNC=1
-##export PW_USE_NVAPI_AND_DLSS=0
+export PW_DISABLED_CREATE_DB=1
-##export PW_OLD_GL_STRING=1
-##export PW_HIDE_NVIDIA_GPU=1
-##export PW_FORCE_USE_VSYNC=0                     # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
-##export PW_VIRTUAL_DESKTOP=1
-##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue
-##export ENABLE_VKBASALT=1
-##export PW_VKBASALT_EFFECTS="FakeHDR:cas"        # Use Reshade in others games (dx9-12 to vulkan only)
-##export PW_VKBASALT_FFX_CAS="0.75"               # FidelityFX Contrast Adaptive Sharpening (min 0 - max 1)
-export PW_NO_FSYNC=1                            # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
-export PW_NO_ESYNC=1                            # Do not use eventfd-based in-process synchronization primitives
-##export PULSE_LATENCY_MSEC=60                    # Fix crackling audio in games
-##export PW_NO_WRITE_WATCH=1                      # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games).
-##export PW_HEAP_DELAY_FREE=1
-##export PW_WINE_ALLOW_XIM=1                      # Disable XIM support until libx11 >= 1.7 is widespread
-##export WINEARCH=win32                             # defaut = win64
-##export WINEPREFIX="${PORT_WINE_PATH}/data/pfx_lol"
-##export PW_WINEDBG_DISABLE=1                     # Disabled WINEDBG
-##export PW_USE_TERMINAL=1                        # Force run in terminal
 ##export PW_GUI_DISABLED_CS=1                     # 1 = disabled GUI
 
 check_download_wine_ver_for_lol () {
@@ -59,38 +39,39 @@ check_download_wine_ver_for_lol () {
 }
 check_download_wine_ver_for_lol
 
-check_port_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!" \
+#     "${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 &
+#     --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
+#     process=LeagueClientUx.exe
-    while [[ -z `pidof ${process}` ]] ; do
+#     while [[ -z `pidof ${process}` ]] ; do
-        echo "PID ${process} not found"
+#         echo "PID ${process} not found"
-        sleep 1
+#         sleep 1
-    done
+#     done
-    uxpid=`pidof ${process}`
+#     uxpid=`pidof ${process}`
-    echo "LeagueClientUx pid: ${uxpid}"
+#     echo "LeagueClientUx pid: ${uxpid}"
-    port=$(xargs -0 < /proc/${uxpid}/cmdline | sed -n 's/.*--app-port=\([[:digit:]]*\).*/\1/p')
+#     port=$(xargs -0 < /proc/${uxpid}/cmdline | sed -n 's/.*--app-port=\([[:digit:]]*\).*/\1/p')
-    if [ ! -n $port ]; then
+#     if [ ! -n $port ]; then
-        echo "Could not find port"
+#         echo "Could not find port"
-        exit 1
+#         exit 1
-    fi
+#     fi
-    echo "Waiting for port ${port}"
+#     echo "Waiting for port ${port}"
-    kill -STOP ${uxpid}
+#     kill -STOP ${uxpid}
-    timeout 200m /usr/bin/env bash -c "
+#     timeout 200m /usr/bin/env bash -c "
-    until openssl s_client -connect :${port} <<< Q > /dev/null 2>&1 ; do
+#     until openssl s_client -connect :${port} <<< Q > /dev/null 2>&1 ; do
-    sleep 1
+#     sleep 1
-    done"
+#     done"
-    kill -CONT ${uxpid}
+#     kill -CONT ${uxpid}
-    kill -s SIGUSR1 "${PW_YAD_PID_LOL}"
+#     kill -s SIGUSR1 "${PW_YAD_PID_LOL}"
-}
+# }
 
 add_in_start_portwine () {
     if [ "$(cat /proc/sys/abi/vsyscall32)" -ne 0 ] ; then
+        pw_stop_progress_bar
         zenity --question --title="Fix for LoL anti-cheat" \
         --text='Root rights are required to execute the command:           \n"sysctl -w abi.vsyscall32=0"' --no-wrap
         [ "$?" = 1 ] && exit 0
         pkexec /usr/bin/env bash -c 'sysctl -w abi.vsyscall32=0'
     fi
-    check_port_for_lol &
+    # check_port_for_lol &
 }

data_from_portwine/scripts/pw_autoinstall/PW_LOL

@@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/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_7.0-1
+export PW_WINE_USE=WINE_LOL_GE_7.0-2
 export WINEDLLOVERRIDES="mscoree,mshtml="
 
 if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then

data_from_portwine/scripts/runlib

@@ -22,6 +22,7 @@ fi
 . "$(dirname $(readlink -f "$0"))/functions_helper"
 
 start_portwine () {
+    pw_update_pfx_cover_gui
     export WINEPREFIX="${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"
     create_new_dir "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/"
     try_force_link_dir "${PORT_WINE_PATH}/data/prefixes" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/"
@@ -66,7 +67,6 @@ start_portwine () {
         xrdb -merge "${HOME}/.Xresources"
     fi
 
-    pw_update_pfx_cover_gui
     pw_init_runtime
 
     if [[ ! -z "${PW_LOG}" && "${PW_LOG}" != 0 ]] ; then

data_from_portwine/scripts/start.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 # Author: PortWINE-Linux.ru
+export NO_AT_BRIDGE=1
 export pw_full_command_line=("$0" $*)
 if [ -f "$1" ]; then
     export portwine_exe="$(readlink -f "$1")"
@@ -23,7 +24,20 @@ if [[ -n `basename "${portwine_exe}" | grep .ppack` ]] ; then
     unset PW_SANDBOX_HOME_PATH
     pw_init_runtime
     export PW_PREFIX_NAME=`basename "$1" | awk -F'.' '{print $1}'`
-    ${pw_runtime} env PATH="${PATH}" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" unsquashfs -f -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}" "$1"
+    ${pw_runtime} env PATH="${PATH}" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" unsquashfs -f -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}" "$1" &
+    sleep 10
+    while true ; do
+        if [[ -n `pgrep -a xterm | grep ".ppack" | head -n 1 | awk '{print $1}'` ]] ; then
+            sleep 0.5
+        else
+            kill -TERM `pgrep -a unsquashfs | grep ".ppack" | head -n 1 | awk '{print $1}'`
+            sleep 0.3
+            if [[ -z "`pgrep -a unsquashfs | grep ".ppack" | head -n 1 | awk '{print $1}'`" ]]
+            then break
+            else sleep 0.3
+            fi
+        fi
+    done
     if [[ -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.create_shortcut" ]] ; then
         orig_IFS="$IFS"
         IFS=$'\n'
@@ -343,7 +357,7 @@ pw_winetricks () {
 
 pw_create_prefix_backup () {
     cd "$HOME"
-    export PW_PREFIX_TO_BACKUP=`"${pw_yad_new}" --file --directory --borders=5 --width=650 --height=500 --auto-close --center \
+    PW_PREFIX_TO_BACKUP=`"${pw_yad_new}" --file --directory --borders=5 --width=650 --height=500 --auto-close --center \
     --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "BACKUP PREFIX TO..."`
     YAD_STATUS="$?"
     if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then exit 0 ; fi
@@ -357,14 +371,17 @@ pw_create_prefix_backup () {
     pw_init_runtime
     chmod -R u+w "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"
     ${pw_runtime} env PATH="${PATH}" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" mksquashfs "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}" "${PW_PREFIX_TO_BACKUP}/${PW_PREFIX_NAME}.ppack.part" -comp zstd &
-    sleep 15
+    sleep 10
     while true ; do
-        if [[ -n `pgrep -a xterm | grep ".ppack" | head -n 1 | awk '{print $1}'` ]] ; then
+        if [[ -n `pgrep -a xterm | grep ".ppack.part" | head -n 1 | awk '{print $1}'` ]] ; then
-            sleep 1
+            sleep 0.5
         else
             kill -TERM `pgrep -a mksquashfs | grep ".ppack.part" | head -n 1 | awk '{print $1}'`
-            sleep 3
+            sleep 0.3
-            break
+            if [[ -z "`pgrep -a mksquashfs | grep ".ppack.part" | head -n 1 | awk '{print $1}'`" ]]
+            then break
+            else sleep 0.3
+            fi
         fi
     done
     if [[ -f "${PW_PREFIX_TO_BACKUP}/${PW_PREFIX_NAME}.ppack.part" ]] ; then
@@ -454,7 +471,7 @@ if [ ! -z "${PORTWINE_DB_FILE}" ] ; then
     case "${PW_VULKAN_USE}" in
             "0") export PW_DEFAULT_VULKAN_USE='OPENGL!VULKAN (DXVK and VKD3D)!VULKAN (WINE DXGI)!GALLIUM_NINE (native DX9 on MESA)' ;;
             "2") export PW_DEFAULT_VULKAN_USE='VULKAN (WINE DXGI)!VULKAN (DXVK and VKD3D)!OPENGL!GALLIUM_NINE (native DX9 on MESA)' ;;
-            "3") export PW_DEFAULT_VULKAN_USE='GALLIUM_NINE (native DX9 on MESA)!VULKAN (WINE DXGI)!VULKAN (DXVK and VKD3D)!OPENGL' ;;
+            "3") export PW_DEFAULT_VULKAN_USE='GALLIUM_NINE (native DX9 on MESA)!VULKAN (DXVK and VKD3D)!VULKAN (WINE DXGI)!OPENGL' ;;
               *) export PW_DEFAULT_VULKAN_USE='VULKAN (DXVK and VKD3D)!VULKAN (WINE DXGI)!OPENGL!GALLIUM_NINE (native DX9 on MESA)' ;;
     esac
     if [[ ! -z `echo "${PW_WINE_USE}" | grep "^PROTON_STEAM$"` ]] ; then
@@ -585,12 +602,12 @@ else
 
     export KEY=$RANDOM
     "${pw_yad_new}" --plug=${KEY} --tabnum=4 --columns=3 --align-buttons --form --separator=";" \
-    --field="   REMOVE PORTPROTON"!""!"":"FBTN" '@bash -c "button_click gui_rm_portproton"' \
+    --field="   $loc_gui_rm_pp"!""!"":"FBTN" '@bash -c "button_click gui_rm_portproton"' \
-    --field="   UPDATE PORTPROTON"!""!"":"FBTN" '@bash -c "button_click gui_pw_update"' \
+    --field="   $loc_gui_upd_pp"!""!"":"FBTN" '@bash -c "button_click gui_pw_update"' \
-    --field="   CHANGELOG"!""!"":"FBTN" '@bash -c "button_click open_changelog"' \
+    --field="   $loc_gui_changelog"!""!"":"FBTN" '@bash -c "button_click open_changelog"' \
-    --field="   EDIT USER.CONF"!""!"":"FBTN" '@bash -c "button_click gui_open_user_conf"' \
+    --field="   $loc_gui_edit_usc"!""!"":"FBTN" '@bash -c "button_click gui_open_user_conf"' \
-    --field="   SCRIPTS FROM BACKUP"!""!"":"FBTN" '@bash -c "button_click gui_open_scripts_from_backup"' &
+    --field="   $loc_gui_scripts_fb"!""!"":"FBTN" '@bash -c "button_click gui_open_scripts_from_backup"' &
-    # --field="   ABOUT PORTPROTON"!""!"":"FBTN" '@bash -c "button_click gui_about_portproton"' &
+    # --field="   $loc_gui_about_us"!""!"":"FBTN" '@bash -c "button_click gui_about_portproton"' &
 
     "${pw_yad_new}" --plug=${KEY} --tabnum=3 --columns=3 --align-buttons --form --separator=";" \
     --field="  3D API  : :CB" "VULKAN (DXVK and VKD3D)!VULKAN (WINE DXGI)!OPENGL!GALLIUM_NINE (native DX9 on MESA)" \
@@ -628,21 +645,21 @@ else
     --field="   Ubisoft Game Launcher"!"$PW_GUI_ICON_PATH/ubc.png"!"":"FBTN" '@bash -c "button_click PW_UBC"' \
     --field="   EVE Online Launcher"!"$PW_GUI_ICON_PATH/eve.png"!"":"FBTN" '@bash -c "button_click PW_EVE"' \
     --field="   Origin Launcher"!"$PW_GUI_ICON_PATH/origin.png"!"":"FBTN" '@bash -c "button_click PW_ORIGIN"' \
-    --field="   Bethesda.net Launcher"!"$PW_GUI_ICON_PATH/bethesda.png"!"":"FBTN" '@bash -c "button_click PW_BETHESDA"' \
     --field="   Rockstar Games Launcher"!"$PW_GUI_ICON_PATH/Rockstar.png"!"":"FBTN" '@bash -c "button_click PW_ROCKSTAR"' \
     --field="   My.Games Launcher"!"$PW_GUI_ICON_PATH/mygames.png"!"":"FBTN" '@bash -c "button_click PW_MYGAMES"' \
-    --field="   OSU"!"$PW_GUI_ICON_PATH/osu.png"!"":"FBTN" '@bash -c "button_click PW_OSU"' \
     --field="   Ankama Launcher"!"$PW_GUI_ICON_PATH/ankama.png"!"":"FBTN" '@bash -c "button_click PW_ANKAMA"' \
+    --field="   OSU"!"$PW_GUI_ICON_PATH/osu.png"!"":"FBTN" '@bash -c "button_click PW_OSU"' \
     --field="   League of Legends"!"$PW_GUI_ICON_PATH/lol.png"!"":"FBTN" '@bash -c "button_click PW_LOL"' \
     --field="   Gameforge Client"!"$PW_GUI_ICON_PATH/gameforge.png"!"":"FBTN" '@bash -c "button_click  PW_GAMEFORGE"' \
     --field="   World of Sea Battle (BETA)"!"$PW_GUI_ICON_PATH/wosb.png"!"":"FBTN" '@bash -c "button_click PW_WOSB"' \
     --field="   ITCH.IO"!"$PW_GUI_ICON_PATH/itch.png"!"":"FBTN" '@bash -c "button_click PW_ITCH"' & 
 
     # --field="   Steam Client Launcher"!"$PW_GUI_ICON_PATH/steam.png"!"":"FBTN" '@bash -c "button_click PW_STEAM"'
+    # --field="   Bethesda.net Launcher"!"$PW_GUI_ICON_PATH/bethesda.png"!"":"FBTN" '@bash -c "button_click PW_BETHESDA"'
 
-    "${pw_yad_new}" --key=$KEY --notebook --borders=5 --width=1000 --height=235 --no-buttons --auto-close --center \
+    "${pw_yad_new}" --key=$KEY --notebook --borders=5 --width=900 --height=235 --no-buttons --auto-close --center \
     --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --title "${portname}-${install_ver} (${scripts_install_ver})" \
-    --tab-pos=bottom --tab="AUTOINSTALL"!""!"" --tab="EMULATORS"!""!"" --tab=" WINE SETTINGS"!""!"" --tab=" PORPROTON SETTINGS"!""!""
+    --tab-pos=bottom --tab=" $loc_mg_autoinstall"!""!"" --tab=" $loc_mg_emulators"!""!"" --tab=" $loc_mg_wine_settings"!""!"" --tab=" $loc_mg_portproton_settings"!""!""
     YAD_STATUS="$?"
     if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then exit 0 ; fi
 

data_from_portwine/scripts/var

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #Author: Castro-Fidel (PortWINE-Linux.ru)
-#SCRIPTS_NEXT_VERSION=2104
+#SCRIPTS_NEXT_VERSION=2105
 ########################################################################
 export PW_MANGOHUD=0
 export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt
@@ -34,10 +34,10 @@ export PW_FORCE_LARGE_ADDRESS_AWARE=1
 export PW_WINE_USE=PROTON_GE
 export PW_PLUGINS_VER="_v5"
 ###WINE_PROTON_STEAM###
-export PW_STEAM_VER="7.0-1B"
+export PW_STEAM_VER="7.0-2"
 export PW_PROTON_STEAM_VER="PROTON_STEAM_${PW_STEAM_VER}"
 ###WINE_PROTON_GE###
-export PW_GE_VER="7-14"
+export PW_GE_VER="7-16"
 export PW_PROTON_GE_VER="PROTON_GE_${PW_GE_VER}"
 export WINE_FULLSCREEN_FSR="1"
 export WINE_FULLSCREEN_FSR_STRENGTH="2"

data_from_portwine/scripts/zen_yad_gui

@@ -133,16 +133,16 @@ pw_tray_icon () {
     }
     export -f tray_icon_click_exit
 
-    "${pw_yad_new}" --notification --no-middle --text="PortProton" \
+    "${pw_yad_new}" --notification --no-middle \
     --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \
     --image="$PW_GUI_ICON_PATH/port_proton.png" \
     --command="bash -c tray_icon_click" \
     --tooltip="PortProton" \
     --menu="| \
-<<<     WINEFILE     >>>!bash -c pw_tray_winefile!"$PW_GUI_ICON_PATH/port_winefile.png"| \
+  ${loc_tray_winefile}!bash -c pw_tray_winefile!"$PW_GUI_ICON_PATH/port_winefile.png"|| \
-<<<     TASKMNR     >>>!bash -c pw_tray_taskmgr!"$PW_GUI_ICON_PATH/port_winefile.png"| \
+  ${loc_tray_tascmng}!bash -c pw_tray_taskmgr!"$PW_GUI_ICON_PATH/port_winefile.png"|| \
-<<< CHANGE  LOG >>>!bash -c open_changelog!"$PW_GUI_ICON_PATH/port_changelog.png"| \
+  ${loc_tray_cangelog}!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"|" & 
+  ${loc_tray_force_exit}    !bash -c tray_icon_click_exit!"$PW_GUI_ICON_PATH/port_exit.png"||" & 
     return 0
 }
   

portwine_install_script/PortProton_1.0

@@ -6,19 +6,23 @@ unset PW_AUTOPLAY PW_SET_LANG PW_SILENT_INSTALL
 export portname="PortProton"
 export port_ver=1.0
 ########################################################################
+export NO_AT_BRIDGE=1
+ENG_LANG="English"
+RUS_LANG="Russian"
 [ -z "${LANG}" ] && export LANG=C
 deflink="${HOME}/PortWINE/${portname}"
-[ $(id -u) -eq 0 ] && echo "Do not run the script from the superuser!" && zenity --error --text "Do not run the script from the superuser!" 2> /dev/null  && exit 1
+[ "$(id -u)" -eq 0 ] && echo "This script should NOT be run by root!" && zenity --error --text "This script should NOT be run by root!" 2> /dev/null && exit 1
-if [ "$(dirname "`readlink -f "$0"`")" == "/usr/bin" ] ; then
+my_dir=$(dirname "$(readlink -f "$0")")
+if [ "$my_dir" == "/usr/bin" ] ; then
 	[ -z "${XDG_DATA_HOME}" ] && export XDG_DATA_HOME="$HOME/.local/share"
 	if [ -f "${XDG_DATA_HOME}/PortWINE/PortProton/data/scripts/start.sh" ] ; then
 		/usr/bin/env bash "${XDG_DATA_HOME}/PortWINE/PortProton/data/scripts/start.sh" "$@"
 		exit 0
 	else
-		if [ ! -z "`locale | grep "LANG=ru_RU.UTF-8"`" ] ; then 
+		if [ -n "$(locale | grep "LANG=ru_RU.UTF-8")" ] ; then
-			PW_SET_LANG="Russian"
+			PW_SET_LANG=$RUS_LANG
 		else
-			PW_SET_LANG="English"
+			PW_SET_LANG=$ENG_LANG
 		fi
 		export PW_SILENT_INSTALL="1"
 		export PW_AUTOPLAY=1
@@ -31,7 +35,7 @@ export PROGS_INST=""
 export vexit=0
 ########################################################################
 for PROGS in "wget" "curl" "tar" "awk" "zenity" "cabextract" "pidof" ; do
-	if [ ! -x "`which "${PROGS}" 2>/dev/null`" ] ; then
+	if [ ! -x "$(which "${PROGS}" 2>/dev/null)" ] ; then
 		PROGS_INST="${PROGS_INST} ${PROGS}" && vexit=1
 	fi
 done
@@ -40,29 +44,30 @@ if [ "${vexit}" -eq "1" ] ; then
     exit 1
 fi
 ########################################################################
-cd "$(dirname "`readlink -f "$0"`")"
+cd "$my_dir"
+export links
 links="$(pwd)"
 ########################################################################
 if [ "$1" = "-rus" ] ; then
-	PW_SET_LANG="Russian"
+	PW_SET_LANG=$RUS_LANG
 	export PW_SILENT_INSTALL="1"
 elif [ "$1" = "-eng" ] ; then
-	PW_SET_LANG="English"
+	PW_SET_LANG=$ENG_LANG
 	export PW_SILENT_INSTALL="1"
 elif [ -z "${PW_SET_LANG}" ] ; then
-	PW_SET_LANG=`zenity --title  "Install $portname" --text "Select the installation language" --list --radiolist \
+	PW_SET_LANG=$(zenity --title  "Install $portname" --text "Select installation language:" --list --radiolist \
---column="Set:" --column "Language:" \
+--column="" --column "Language" \
-	TRUE "Russian" \
+	TRUE  "$RUS_LANG" \
-	FALSE "English" ` 2> /dev/null  
+	FALSE "$ENG_LANG" ) 2> /dev/null
-	if [ $? -eq 1 ] ; then exit 1 ; fi
+	if [ $? -eq 1 ] ; then echo "Installation language not set!" && exit 1 ; fi
 	case $PW_SET_LANG in
-		"Russian")
+		"$RUS_LANG")
-			INFO_TEXT="Вы запустили установщик PortWINE ${portname} версии ${port_ver}. \n\nЭто не коммерческий продукт и развивается исключительно за идею и Ваши пожертвования. \nВсе права сторонего програмного обеспечения принадлежат их владельцам! \nПродолжая установку вы автоматически соглашаетесь с данными условиями." > /dev/null 2>&1 ;;	
+			INFO_TEXT="Вы запустили установщик PortWINE ${portname} версии ${port_ver}. \n\nЭто некоммерческий продукт и развивается исключительно за идею и Ваши пожертвования. \nВсе права стороннего программного обеспечения принадлежат их владельцам! \nПродолжая установку, Вы автоматически соглашаетесь с данными условиями." > /dev/null 2>&1 ;;
-		"English")
+		"$ENG_LANG")
-			INFO_TEXT="You run the installer PortWINE ${portname} v. ${port_ver}. \n\nThis is not a commercial product and developed exclusively for the idea and donate. \nAll rights to third-party software belong to their respective owners! \nContinuing the installation of you agree to these terms." > /dev/null 2>&1 ;;
+			INFO_TEXT="You’ve started PortWINE ${portname} installer v.${port_ver}. \n\nIt is a non-commercial product and is developed only for the idea and with the help of your donations. \nAll third-party software rights belong to their respective owners! \nIf you continue installation, you agree to these terms." > /dev/null 2>&1 ;;
 	esac
-	`zenity --info --title "INFO" --text "$INFO_TEXT" --no-wrap ` 2> /dev/null 
+	zenity --info --title "INFO" --text "$INFO_TEXT" --no-wrap 2> /dev/null
-	if [ $? -eq 1 ] ; then echo "error" && exit 1 ; fi
+	if [ $? -eq 1 ] ; then echo "INFO message not displayed!" && exit 1 ; fi
 fi
 ########################################################################
 if [ "${PW_SILENT_INSTALL}" = "1" ] ; then
@@ -70,30 +75,30 @@ if [ "${PW_SILENT_INSTALL}" = "1" ] ; then
 	D_PATH="${deflink}"
 else
 	case $PW_SET_LANG in
-		"Russian")
+		"$RUS_LANG")
-			inst1=`zenity --title  "Install ${portname}" --text "Выберите путь для установки (обновления) порта,\nили оставьте его по умолчанию." --list --radiolist --width=350 --height=220 \
+			inst1=$(zenity --title  "Установка ${portname}" --text "Выберите путь для установки (обновления) PortWINE \nили оставьте его по умолчанию." --list --radiolist --width=350 --height=220 \
-			--column="Выбор" --column "Путь:" \
+			--column="" --column "Путь:" \
-			TRUE "${deflink}" \
+			TRUE  "${deflink}" \
-			FALSE "Другой путь..." ` 2> /dev/null
+			FALSE "Другой путь..." ) 2> /dev/null
-			if [ $? -eq 1 ] ; then exit 1 ; fi
+			if [ $? -eq 1 ] ; then echo "Installation path not set!" && exit 1 ; fi
 			case $inst1 in
 				"${deflink}")
 					D_PATH="${deflink}" ;;
 				"Другой путь...")
-					D_PATH=`zenity --file-selection --directory --title="Выберите путь..." ` 
+					D_PATH=$(zenity --file-selection --directory --title="Выберите путь..." )
 					D_PATH="${D_PATH}/${portname}" ;;
 			esac ;;
-		"English")
+		"$ENG_LANG")
-			inst1=`zenity --title  "Install ${portname}" --text "Select the installation path (update) port,\nor leave it in default." --list --radiolist --width=350 --height=220 \
+			inst1=$(zenity --title  "Install ${portname}" --text "Choose path to install (update) PortWINE \nor leave it as default." --list --radiolist --width=350 --height=220 \
-			--column="Set..." --column "Path:" \
+			--column="" --column "Path:" \
-			TRUE "${deflink}" \
+			TRUE  "${deflink}" \
-			FALSE "Other path..." ` 2> /dev/null
+			FALSE "Other path..." ) 2> /dev/null
-			if [ $? -eq 1 ];then exit 1; fi
+			if [ $? -eq 1 ] ; then echo "Installation path not set!" && exit 1; fi
 			case $inst1 in
 				"${deflink}")
 					D_PATH="${deflink}" ;;
 				"Other path...")
-					D_PATH=`zenity --file-selection --directory --title="Select the path..." ` 
+					D_PATH=$(zenity --file-selection --directory --title="Choose your path..." )
 					D_PATH="${D_PATH}/${portname}" ;;
 			esac ;;
 	esac
@@ -101,29 +106,30 @@ else
 fi
 ########################################################################
 case $PW_SET_LANG in
-	"Russian")
+	"$RUS_LANG")
 		progress_bar() {
-		zenity --progress --title="Установка..." --text="Настройка ${portname}" --pulsate --auto-close --auto-kill --width=450 > /dev/null 2>&1 
+			zenity --progress --title="Установка..." --text="Настройка ${portname}" --pulsate --auto-close --auto-kill --width=450 > /dev/null 2>&1
 		} ;;
-	"English")
+	"$ENG_LANG")
 		progress_bar() {
-		zenity --progress --title="Install..." --text="Install ${portname}" --pulsate --auto-close --auto-kill --width=450 > /dev/null 2>&1 
+			zenity --progress --title="Install..." --text="Install ${portname}" --pulsate --auto-close --auto-kill --width=450 > /dev/null 2>&1
 		} ;;
 esac
 ########################################################################
 export PORT_WINE_PATH="${D_PATH}"
+scripts_dir="${PORT_WINE_PATH}/data/scripts"
 if [ ! -d "${PORT_WINE_PATH}" ] ; then
     mkdir -p "$PORT_WINE_PATH"
 else
 	rm -fr "${PORT_WINE_PATH}/data/tmp"
-	rm -f "${PORT_WINE_PATH}/data/scripts/"* > /dev/null 2>&1
+	rm -f "${scripts_dir}/"* > /dev/null 2>&1
 fi
 ########################################################################
 mkdir -p "${PORT_WINE_PATH}/data/tmp"
 echo "${port_ver}" > "${PORT_WINE_PATH}/data/tmp/${portname}_ver"
 case $PW_SET_LANG in
-	"Russian") echo "RUS" > "${PORT_WINE_PATH}/data/tmp/${portname}_loc" ;;
+	"$RUS_LANG") echo "RUS" > "${PORT_WINE_PATH}/data/tmp/${portname}_loc" ;;
-	"English") echo "ENG" > "${PORT_WINE_PATH}/data/tmp/${portname}_loc" ;;
+	"$ENG_LANG") echo "ENG" > "${PORT_WINE_PATH}/data/tmp/${portname}_loc" ;;
 esac
 ########################################################################
 export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp"
@@ -140,7 +146,8 @@ try_download_scripts () {
 			cp -fr "${PORT_WINE_TMP_PATH}/PortWINE-master/data_from_portwine/"* "${PORT_WINE_PATH}/data/"
 			rm -f "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz"
 			rm -fr "${PORT_WINE_TMP_PATH}/PortWINE-master/"
-			export scripts_current_ver=`cat "${PORT_WINE_PATH}/data/scripts/var" | grep SCRIPTS_NEXT_VERSION | awk -F "=" '{print $2}'`
+			export scripts_current_ver
+			scripts_current_ver=$(cat "${scripts_dir}/var" | grep SCRIPTS_NEXT_VERSION | awk -F "=" '{print $2}')
 			echo "${scripts_current_ver}" > "${PORT_WINE_TMP_PATH}/scripts_ver"
 		else
 			rm -f "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz"
@@ -150,13 +157,12 @@ try_download_scripts () {
 		try_download_scripts
 	fi
 }
-if [ "${PW_SILENT_INSTALL}" = "1" ] & [ ! -f "/usr/bin/portproton" ] ; then
+if [ "${PW_SILENT_INSTALL}" = "1" ] && [ ! -f "/usr/bin/portproton" ] ; then
 	try_download_scripts
 else
 	try_download_scripts | progress_bar
 fi
 chmod 755 -R "${PORT_WINE_PATH}"
 ########################################################################
-cd "${PORT_WINE_PATH}/data/scripts"
+cd "${scripts_dir}"
-/usr/bin/env bash "${PORT_WINE_PATH}/data/scripts/setup.sh" && exit 0
+/usr/bin/env bash "${scripts_dir}/setup.sh" && exit 0
-################################ARCH_BIN################################