Check for desktop environment before parsing xinitrc

This commit is contained in:
jschx committed 2018-04-26 18:38:50 -05:00
1 parent 76d8e76456
commit 0c10b233ff
13 files changed
+182 -26

No files matched your search

+14 -2
View File
@@ -11,8 +11,20 @@ kernel="$(uname -sr)"
uptime="$(uptime -p | sed 's/up //')"
packages="$(xbps-query -l | wc -l)"
shell="$(basename ${SHELL})"
if [ -z "${WM}" ]; then
WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
if [ "${XDG_CURRENT_DESKTOP}" ]; then
envtype='DE'
WM="${XDG_CURRENT_DESKTOP}"
elif [ "${DESKTOP_SESSION}" ]; then
envtype='DE'
WM="${DESKTOP_SESSION}"
else
envtype='WM'
WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
fi
else
envtype='WM'
fi
## DEFINE COLORS
@@ -46,6 +58,6 @@ ${c1} | \ ${c0}___ \ | ${lc}KERNEL: ${ic}${kernel}${reset}
${c1} | | ${c0}/ \ | | ${lc}UPTIME: ${ic}${uptime}${reset}
${c1} | | ${c0}\___/ | | ${lc}PACKAGES: ${ic}${packages}${reset}
${c1} | \______ ${c0}\_| ${lc}SHELL: ${ic}${shell}${reset}
${c1} \_______\ ${lc}WM: ${ic}${WM}${reset}
${c1} \_______\ ${lc}${envtype}: ${ic}${WM}${reset}
EOF