Merge branch 'Boria138-dash' into devel
This commit is contained in:
commit
f302b594d6
@ -1931,7 +1931,7 @@ pw_kill_autostart () {
|
|||||||
export -f pw_kill_autostart
|
export -f pw_kill_autostart
|
||||||
|
|
||||||
pw_exit_tray () {
|
pw_exit_tray () {
|
||||||
if [[ "$XDG_SESSION_TYPE" == "tty" ]] ; then
|
if [[ "$XDG_SESSION_TYPE" == "tty" || "$(readlink -f /bin/sh)" == *"/dash" ]] ; then
|
||||||
if [[ -n "$(pgrep -a yad_gui_pp | grep "\--notification" | awk '{print $1}')" ]] ; 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}')"
|
kill -s SIGUSR1 "$(pgrep -a yad_gui_pp | grep "\--notification" | awk '{print $1}')"
|
||||||
fi
|
fi
|
||||||
@ -1940,9 +1940,6 @@ pw_exit_tray () {
|
|||||||
kill -s SIGUSR1 $(pgrep -a tray_gui_pp) 2>/dev/null
|
kill -s SIGUSR1 $(pgrep -a tray_gui_pp) 2>/dev/null
|
||||||
fi
|
fi
|
||||||
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
|
export -f pw_exit_tray
|
||||||
|
|
||||||
@ -4783,7 +4780,7 @@ open_changelog () {
|
|||||||
export -f open_changelog
|
export -f open_changelog
|
||||||
|
|
||||||
pw_tray_icon () {
|
pw_tray_icon () {
|
||||||
if [[ "$XDG_SESSION_TYPE" == "tty" ]] ; then
|
if [[ "$XDG_SESSION_TYPE" == "tty" || "$(readlink -f /bin/sh)" == *"/dash" ]] ; then
|
||||||
if [[ -n "$(pgrep -a yad_gui_pp | grep "\--notification" | awk '{print $1}')" ]] ; 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}')"
|
kill -s SIGUSR1 "$(pgrep -a yad_gui_pp | grep "\--notification" | awk '{print $1}')"
|
||||||
fi
|
fi
|
||||||
@ -4809,7 +4806,7 @@ pw_tray_icon () {
|
|||||||
}
|
}
|
||||||
export -f tray_icon_click_exit
|
export -f tray_icon_click_exit
|
||||||
|
|
||||||
if [[ "$XDG_SESSION_TYPE" == "tty" ]] ; then
|
if [[ "$XDG_SESSION_TYPE" == "tty" || "$(readlink -f /bin/sh)" == *"/dash" ]] ; then
|
||||||
tray_icon_click () {
|
tray_icon_click () {
|
||||||
echo ""
|
echo ""
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user