Improved UI detection and various consistency fixes

ufetch-macos

@@ -9,6 +9,10 @@ host="$(hostname)"
 os="$(sw_vers -productName) $(sw_vers -productVersion)"
 kernel="$(uname -sr)"
 uptime="$(uptime | awk -F, '{sub(".*up ",x,$1);print $1}' | sed -e 's/^[ \t]*//')"
+shell="$(basename "$SHELL")"
+
+## PACKAGE MANAGER DETECTION
+
 if [ -x "$(command -v pkgin)" ]; then
 	packages="$(pkgin list | wc -l)"
 elif [ -x "$(command -v brew)" ]; then
@@ -18,12 +22,22 @@ elif [ -x "$(command -v brew)" ]; then
 elif [ -x "$(command -v port)" ]; then
 	packages="$(port installed | wc -l)"
 else
-	packages='no package manager'
+	packages='unknown'
 fi
+
 packages="$(echo ${packages} | sed -e 's/^[ /t]*//')"
-shell="$(basename "$SHELL")"
-if [ -z "${WM}" ]; then
-	WM='Quartz Compositor'
+
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+	ui="${DE}"
+	uitype='DE'
+elif [ -n "${WM}" ]; then
+	ui="${WM}"
+	uitype='WM'
+else
+	ui='Aqua'
+	uitype='UI'
 fi
 
 ## DEFINE COLORS
@@ -51,13 +65,13 @@ c0="${reset}"                       # first color
 ## OUTPUT
 
 cat <<EOF
-
+${c0}          _${reset}
 ${c0}         (/     ${nc}${USER}${ic}@${nc}${host}${reset}
 ${c0}    .---__--.   ${lc}OS:        ${ic}${os}${reset}
 ${c0}   /         \  ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}  |         /   ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c0}  |         \\_  ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c0}   \         /  ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}    \`._.-._.\`   ${lc}WM:        ${ic}${WM}${reset}
+${c0}    \`._.-._.\`   ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF