Merge branch 'Htylol-fixes_for_pw_exit_tray' into devel

This commit is contained in:
Mikhail Tergoev 2025-04-08 17:39:17 +03:00
commit 8f141dd84c

@ -1932,15 +1932,10 @@ pw_kill_autostart () {
export -f pw_kill_autostart export -f pw_kill_autostart
pw_exit_tray () { pw_exit_tray () {
if [[ "$XDG_SESSION_TYPE" == "tty" || "$(readlink -f /bin/sh)" == *"/dash" ]] ; then read -r -a PGREP_TRAY_GUI_PP < <(pgrep -a tray_gui_pp)
if [[ -n "$(pgrep -a yad_gui_pp | grep "\--notification" | awk '{print $1}')" ]] ; then [[ -n ${PGREP_TRAY_GUI_PP[0]} ]] && kill -s SIGUSR1 "${PGREP_TRAY_GUI_PP[0]}" 2>/dev/null
kill -s SIGUSR1 "$(pgrep -a yad_gui_pp | grep "\--notification" | awk '{print $1}')" read -r -a PGREP_YAD_GUI_PP < <(pgrep -a yad_gui_pp)
fi [[ -n ${PGREP_YAD_GUI_PP[0]} ]] && kill -s SIGUSR1 "${PGREP_YAD_GUI_PP[0]}" 2>/dev/null
else
if [[ -n "$(pgrep -a tray_gui_pp)" ]] ; then
kill -s SIGUSR1 $(pgrep -a tray_gui_pp) 2>/dev/null
fi
fi
} }
export -f pw_exit_tray export -f pw_exit_tray