From c3596680c9d6238cc1f3f7190685e7dfdaa7cb11 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Tue, 13 Dec 2016 11:22:39 +1100
Subject: [PATCH 1/2] 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.

From 101d5c5254ba176822503cc82cd413319bf76ff4 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Tue, 13 Dec 2016 11:25:00 +1100
Subject: [PATCH 2/2] DE: Check {GNOME,MATE}_DESKTOP_SESSION_ID

---
 neofetch | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/neofetch b/neofetch
index 0433d143..635e339c 100755
--- a/neofetch
+++ b/neofetch
@@ -544,6 +544,12 @@ get_de() {
 
             elif [[ "$DESKTOP_SESSION" ]]; then
                 de="${DESKTOP_SESSION/ *}"
+
+            elif [[ "$GOME_DESKTOP_SESSION_ID" ]]; then
+                de="GNOME"
+
+            elif [[ "$MATE_DESKTOP_SESSION_ID" ]]; then
+                de="MATE"
             fi
         ;;
     esac
@@ -560,7 +566,7 @@ get_de() {
         *"xfce4"*) de="XFCE4" ;;
         *"xfce5"*) de="XFCE5" ;;
         *"xfce"*)  de="XFCE" ;;
-        *"mate"*)  de="MATE"
+        *"mate"*)  de="MATE" ;;
     esac
 
     # Log that the function was run.