From 6e20dfe75926d06ad5c1bbeba8fbd663048da429 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 22 Dec 2017 10:11:45 +1100 Subject: [PATCH] DE/WM: Added support for TDE --- neofetch | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 1724d6c3..9987bc35 100755 --- a/neofetch +++ b/neofetch @@ -114,7 +114,7 @@ get_distro() { elif type -p tazpkg >/dev/null; then distro="SliTaz $(< /etc/slitaz-release)" - elif type -p kpm > /dev/null; then + elif type -p kpt /dev/null && type -p kpm > /dev/null; then distro="KSLinux" elif [[ -d "/system/app/" && -d "/system/priv-app" ]]; then @@ -476,6 +476,7 @@ get_packages() { # This solves issues with neofetch opening the "pacman" game. local PATH=":${PATH}:" local PATH="${PATH/':/usr/games:'/:}" + local PATH="${PATH/':/opt/trinity/bin:'/:}" local PATH="${PATH%:}" local PATH="${PATH#:}" @@ -666,6 +667,9 @@ get_de() { elif [[ "$MATE_DESKTOP_SESSION_ID" ]]; then de="MATE" + + elif [[ "$TDE_FULL_SESSION" ]]; then + de="Trinity" fi # When a window manager is started from a display manager @@ -683,7 +687,6 @@ get_de() { # Format strings. case "$de" in "KDE_SESSION_VERSION"*) de="KDE${de/* = }" ;; - *"TDE_FULL_SESSION"*) de="Trinity" ;; *"MUFFIN"* | "Cinnamon") de="$(cinnamon --version)"; de="${de:-Cinnamon}" ;; *"xfce4"*) de="Xfce4" ;; *"xfce5"*) de="Xfce5" ;; @@ -707,7 +710,7 @@ get_wm() { id="$(xprop -root -notype _NET_SUPPORTING_WM_CHECK)" id="${id##* }" wm="$(xprop -id "$id" -notype -len 100 -f _NET_WM_NAME 8t)" - wm="${wm/*_NET_WM_NAME = }" + wm="${wm/*WM_NAME = }" wm="${wm/\"}" wm="${wm/\"*}"