Merge branch 'master' of github.com:dylanaraps/neofetch into master
This commit is contained in:
commit
bc4c3bc8f9
10
neofetch
10
neofetch
|
@ -1821,7 +1821,14 @@ get_wm() {
|
||||||
*) ps_flags=(-e) ;;
|
*) ps_flags=(-e) ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if [[ $WAYLAND_DISPLAY ]]; then
|
if [[ -O "${XDG_RUNTIME_DIR}/${WAYLAND_DISPLAY:-wayland-0}" ]]; then
|
||||||
|
if tmp_pid="$(lsof -t "${XDG_RUNTIME_DIR}/${WAYLAND_DISPLAY:-wayland-0}" 2>&1)" ||
|
||||||
|
tmp_pid="$(fuser "${XDG_RUNTIME_DIR}/${WAYLAND_DISPLAY:-wayland-0}" 2>&1)"; then
|
||||||
|
wm="$(ps -p "${tmp_pid}" -ho comm=)"
|
||||||
|
else
|
||||||
|
# lsof may not exist, or may need root on some systems. Similarly fuser.
|
||||||
|
# On those systems we search for a list of known window managers, this can mistakenly
|
||||||
|
# match processes for another user or session and will miss unlisted window managers.
|
||||||
wm=$(ps "${ps_flags[@]}" | grep -m 1 -o -F \
|
wm=$(ps "${ps_flags[@]}" | grep -m 1 -o -F \
|
||||||
-e arcan \
|
-e arcan \
|
||||||
-e asc \
|
-e asc \
|
||||||
|
@ -1850,6 +1857,7 @@ get_wm() {
|
||||||
-e westeros \
|
-e westeros \
|
||||||
-e westford \
|
-e westford \
|
||||||
-e weston)
|
-e weston)
|
||||||
|
fi
|
||||||
|
|
||||||
elif [[ $DISPLAY && $os != "Mac OS X" && $os != "macOS" && $os != FreeMiNT ]]; then
|
elif [[ $DISPLAY && $os != "Mac OS X" && $os != "macOS" && $os != FreeMiNT ]]; then
|
||||||
type -p xprop &>/dev/null && {
|
type -p xprop &>/dev/null && {
|
||||||
|
|
Reference in New Issue