From b88c7d0e9675430481409b99ca128e9d7636c92f Mon Sep 17 00:00:00 2001
From: Mikhail Tergoev <fidel@altlinux.org>
Date: Sat, 14 Sep 2024 11:08:46 +0300
Subject: [PATCH] Scripts version 2345

---
 data_from_portwine/changelog_en             |  4 +++
 data_from_portwine/changelog_ru             |  4 +++
 data_from_portwine/scripts/functions_helper | 35 ++++++++++++---------
 data_from_portwine/scripts/var              |  2 +-
 4 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en
index 69e22c6..844931b 100755
--- a/data_from_portwine/changelog_en
+++ b/data_from_portwine/changelog_en
@@ -2,6 +2,10 @@ You can help us in the development of the project on the website: https://linux-
 ----------------------------------------
 Changelog:
 
+###Scripts version 2345### / Date: 14.09.2024 / Download update size: 4 megabytes
+* fixed automatic closing of the tray after using AUTOINSTALL
+* faster startup when it is not possible to check for updates
+
 ###Scripts version 2344### / Date: 13.09.2024 / Download update size: 4 megabytes
 * many thanks to Htylol for this update, everything listed below is his merit :)
     * added reset settings for mangohud and vkbasalt
diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru
index 626dbf0..3912c4f 100755
--- a/data_from_portwine/changelog_ru
+++ b/data_from_portwine/changelog_ru
@@ -2,6 +2,10 @@
 -----------------------------------------
 История изменений:
 
+###Scripts version 2345### / Дата: 14.09.2024 / Размер скачиваемого обновления: 4 мегабайт
+* исправлено автоматическое закрытие трея после использования АВТОУСТАНОВОК
+* ускорен запуск при отсутствии возможности проверки обновлений
+
 ###Scripts version 2344### / Дата: 13.09.2024 / Размер скачиваемого обновления: 4 мегабайт
 * за данное обноление огромное спасибо Htylol, все нижеперечисленное - его заслуга :)
     * добавлен сброс настроек для mangohud и vkbasalt
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index b7606eb..bfda814 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -1056,6 +1056,22 @@ pw_kill_autostart () {
 }
 export -f pw_kill_autostart
 
+pw_exit_tray () {
+    if [[ "$XDG_SESSION_TYPE" == "tty" ]] ; then
+        if [[ -n "$(pgrep -a yad_gui_pp | grep "\--notification" | awk '{print $1}')" ]] ; then
+            kill -s SIGUSR1 "$(pgrep -a yad_gui_pp | grep "\--notification" | awk '{print $1}')"
+        fi
+    else
+        if [[ -n "$(pgrep -a tray_gui_pp)" ]] ; then
+            kill -s SIGUSR1 $(pgrep -a tray_gui_pp) 2>/dev/null
+        fi
+    fi
+    if [[ -n "$(pgrep -a yad_gui_pp)" ]] ; then
+        kill -s SIGUSR1 $(pgrep -a yad_gui_pp) 2>/dev/null
+    fi
+}
+export -f pw_exit_tray
+
 stop_portwine () {
     [[ "$int_xneur" == "1"  ]] && xneur &
 
@@ -1094,18 +1110,7 @@ stop_portwine () {
     kill_portwine &&
     try_remove_dir "${PW_WINELIB}/var"
     find "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/" -maxdepth 1 -type f -name "*.tmp" -delete
-    if [[ "$XDG_SESSION_TYPE" == "tty" ]] ; then
-        if [[ -n "$(pgrep -a yad_gui_pp | grep "\--notification" | awk '{print $1}')" ]] ; then
-            kill -s SIGUSR1 "$(pgrep -a yad_gui_pp | grep "\--notification" | awk '{print $1}')"
-        fi
-    else
-        if [[ -n "$(pgrep -a tray_gui_pp)" ]] ; then
-            kill -s SIGUSR1 $(pgrep -a tray_gui_pp) 2>/dev/null
-        fi
-    fi
-    if [[ -n "$(pgrep -a yad_gui_pp)" ]] ; then
-        kill -s SIGUSR1 $(pgrep -a yad_gui_pp) 2>/dev/null
-    fi
+    pw_exit_tray
     pw_auto_create_shortcut
     add_in_stop_portwine
     unset SKIP_CHECK_UPDATES
@@ -1562,12 +1567,12 @@ pw_port_update () {
     fi
     scripts_install_ver=$(head -n 1 "${PORT_WINE_TMP_PATH}/scripts_ver")
     print_info "Check update..."
-    if curl -f -s --list-only --connect-timeout 3 "https://gitlab.eterfund.ru/Castro-Fidel/PortWINE/raw/${BRANCH}/data_from_portwine/scripts/var" > "${PORT_WINE_TMP_PATH}/curent_var_ver"
+    if curl -f -s --list-only --connect-timeout 2 --retry 0 "https://gitlab.eterfund.ru/Castro-Fidel/PortWINE/raw/${BRANCH}/data_from_portwine/scripts/var" > "${PORT_WINE_TMP_PATH}/curent_var_ver"
     then
         URL_FOR_CHANGELOG="https://gitlab.eterfund.ru/Castro-Fidel/PortWINE/raw/${BRANCH}/data_from_portwine"
         URL_TO_PW_BRANCH="https://gitlab.eterfund.ru/Castro-Fidel/PortWINE/-/archive/${BRANCH}/PortWINE-${BRANCH}.tar.gz"
     else
-        if curl -f -s --list-only --connect-timeout 3 "https://raw.githubusercontent.com/Castro-Fidel/PortWINE/${BRANCH}/data_from_portwine/scripts/var" > "${PORT_WINE_TMP_PATH}/curent_var_ver"
+        if curl -f -s --list-only --connect-timeout 2 --retry 0 "https://raw.githubusercontent.com/Castro-Fidel/PortWINE/${BRANCH}/data_from_portwine/scripts/var" > "${PORT_WINE_TMP_PATH}/curent_var_ver"
         then
             URL_FOR_CHANGELOG="https://raw.githubusercontent.com/Castro-Fidel/PortWINE/${BRANCH}/data_from_portwine"
             URL_TO_PW_BRANCH="https://github.com/Castro-Fidel/PortWINE/archive/refs/heads/${BRANCH}.tar.gz"
@@ -4804,6 +4809,7 @@ resize_png () {
 portwine_create_shortcut () {
     export GDK_BACKEND="x11"
     pw_stop_progress_bar
+    pw_exit_tray
     [[ ! -e ${portwine_exe} ]] && return 1
     unset PORTPROTON_NAME name_desktop_png
     pw_create_gui_png
@@ -5433,6 +5439,7 @@ pw_autoinstall_from_db () {
     export PW_VKBASALT=0
     export PW_USE_D3D_EXTRAS=1
     . "${PORT_SCRIPTS_PATH}/pw_autoinstall/${PW_YAD_SET}"
+
 }
 
 button_click () {
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index bb353d0..3dbf915 100755
--- a/data_from_portwine/scripts/var
+++ b/data_from_portwine/scripts/var
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #Author: Castro-Fidel (linux-gaming.ru)
-#SCRIPTS_NEXT_VERSION=2344
+#SCRIPTS_NEXT_VERSION=2345
 #SCRIPTS_STABLE_VERSION=2342
 ########################################################################
 # export PROTON_USE_XALIA="1"