Improved UI detection and various consistency fixes

ufetch-linux

@@ -9,21 +9,32 @@ host="$(hostname)"
 os='Linux'	# I'd just like to interject for a moment...
 kernel="$(uname -sr)"
 uptime="$(uptime | awk -F, '{sub(".*up ",x,$1);print $1}' | sed -e 's/^[ \t]*//')"
+packages='unknown'
 shell="$(basename "$SHELL")"
 
-if [ -z "${WM}" ]; then
-	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE:'
-		WM="${XDG_CURRENT_DESKTOP}"
-	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE:'
-		WM="${DESKTOP_SESSION}"
-	elif [ -f "${HOME}/.xinitrc" ]; then
-		envtype='WM:'
-		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-	fi
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-	envtype='WM:'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -58,8 +69,8 @@ ${c0}      ___     ${nc}${USER}${ic}@${nc}${host}${reset}
 ${c0}     (${c1}.. ${c0}\    ${lc}OS:        ${ic}${os}${reset}
 ${c0}     (${c2}<> ${c0}|    ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}    /${c1}/  \\ ${c0}\\   ${lc}UPTIME:    ${ic}${uptime}${reset}
-${c0}   ( ${c1}|  | ${c0}/|  ${lc}SHELL:     ${ic}${shell}${reset}
-${c2}  _${c0}/\\ ${c1}__)${c0}/${c2}_${c0})  ${lc}${envtype}        ${ic}${WM}${reset}
-${c2}  \/${c0}-____${c2}\/${reset}
+${c0}   ( ${c1}|  | ${c0}/|  ${lc}PACKAGES:  ${ic}${packages}${reset} 
+${c2}  _${c0}/\\ ${c1}__)${c0}/${c2}_${c0})  ${lc}SHELL:     ${ic}${shell}${reset}
+${c2}  \/${c0}-____${c2}\/${reset}   ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF