mirror of
https://gitlab.com/jschx/ufetch.git
synced 2026-09-30 21:42:51 +07:00
Improved UI detection and various consistency fixes
This commit is contained in:
+23
-13
@@ -12,19 +12,29 @@ uptime="$(uptime -p | sed 's/up //')"
|
||||
packages="$(pacman -Q | wc -l)"
|
||||
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
|
||||
@@ -59,6 +69,6 @@ ${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}${envtype} ${ic}${WM}${reset}
|
||||
${c0} /.\` \`.\\ ${lc}${uitype}: ${ic}${ui}${reset}
|
||||
|
||||
EOF
|
||||
|
||||
Reference in New Issue
Block a user