From c3596680c9d6238cc1f3f7190685e7dfdaa7cb11 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 13 Dec 2016 11:22:39 +1100 Subject: [PATCH] DE: Better DE detection --- neofetch | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 68b7451c..0433d143 100755 --- a/neofetch +++ b/neofetch @@ -537,9 +537,14 @@ get_de() { ;; *) - de="${XDG_CURRENT_DESKTOP/i3}" - de="${de/'X-'}" - de="${de/Budgie:GNOME/Budgie}" + if [[ "$XDG_CURRENT_DESKTOP" ]]; then + de="${XDG_CURRENT_DESKTOP/i3}" + de="${de/'X-'}" + de="${de/Budgie:GNOME/Budgie}" + + elif [[ "$DESKTOP_SESSION" ]]; then + de="${DESKTOP_SESSION/ *}" + fi ;; esac @@ -554,6 +559,8 @@ get_de() { *"MUFFIN"* | "Cinnamon") de="$(cinnamon --version)"; de="${de:-Cinnamon}" ;; *"xfce4"*) de="XFCE4" ;; *"xfce5"*) de="XFCE5" ;; + *"xfce"*) de="XFCE" ;; + *"mate"*) de="MATE" esac # Log that the function was run.