wt/ufetch
1
0
Fork 0
mirror of https://gitlab.com/jschx/ufetch.git synced 2026-10-01 05:52:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

Improved UI detection and various consistency fixes

Browse Source
This commit is contained in:
jschx
2019-02-13 18:03:13 -06:00
parent d9202990ae
commit 4862ade286
33 changed files with 771 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ufetch-fedora
+23 -13
View File
@@ -12,19 +12,29 @@ uptime="$(uptime -p | sed 's/up //')"
packages="$(yum list installed | 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
@@ -60,6 +70,6 @@ ${c1} __${c0}_| |_${c1}_/ / ${lc}KERNEL: ${ic}${kernel}${reset}
${c1} / ${c0}(_ _)${c1}_/ ${lc}UPTIME: ${ic}${uptime}${reset}
${c1} / / ${c0}| | ${lc}PACKAGES: ${ic}${packages}${reset}
${c1} \\ \\${c0}__/ | ${lc}SHELL: ${ic}${shell}${reset}
${c1} \\${c0}(_____/ ${lc}${envtype} ${ic}${WM}${reset}
${c1} \\${c0}(_____/ ${lc}${uitype}: ${ic}${ui}${reset}
EOF