From 38e316733b733e6147a5d4421406bb31b0ff96c1 Mon Sep 17 00:00:00 2001
From: Dylan <dyl@tfwno.gf>
Date: Tue, 29 Mar 2016 23:14:35 +1100
Subject: [PATCH] Misc fixes

---
 neofetch | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/neofetch b/neofetch
index 9807cd12..9e0df89f 100755
--- a/neofetch
+++ b/neofetch
@@ -775,7 +775,7 @@ getshell () {
 # Desktop Environment {{{
 
 getde () {
-    [ "$XDG_CURRENT_DESKTOP" != "i3" ] && de="$XDG_CURRENT_DESKTOP"
+    de="${XDG_CURRENT_DESKTOP/i3}"
 }
 
 # }}}
@@ -1093,8 +1093,8 @@ getgpu () {
 getmemory () {
     case "$os" in
         "Linux" | "Windows")
-            mem=($(awk -F ':| kB' '/MemTotal|MemFree|Buffers|Cached/ {printf $2}' /proc/meminfo ) 0 0)
-            memused=$((${mem[0]} - ${mem[1]} - ${mem[2]} - ${mem[3]}))
+            mem=($(awk -F ':| kB' '/MemTotal|MemFree|Buffers|Cached/ {printf $2}' /proc/meminfo))
+            memused=$((${mem[0]} - ${mem[1]} - ${mem[2]:-0} - ${mem[3]:-0}))
             memused=$((memused / 1024))
             memtotal=$((${mem[0]} / 1024))
         ;;
@@ -1360,9 +1360,8 @@ getstyle () {
             ;;
 
             "Xfce"*)
-                if type -p xfconf-query >/dev/null 2>&1; then
+                type -p xfconf-query >/dev/null 2>&1 && \
                     gtk2theme=$(xfconf-query -c xsettings -p /Net/$xfconf)
-                fi
             ;;
         esac