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 -v)"
uptime="$(uptime | awk -F, '{sub(".*up ",x,$1);print $1}' | sed -e 's/^[ \t]*//')"
packages="$(ls -d /var/db/pkg/* | wc -l | sed -e 's/^[ \t]*//')"
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
@@ -48,6 +60,6 @@ ${c0} \_/ \ ${lc}KERNEL: ${ic}${kernel}${reset}
${c0} | ${c1}O O ${c0}| ${lc}UPTIME: ${ic}${uptime}${reset}
${c0} |_ ${c2}< ${c0}) ${c2}3 ${c0}) ${lc}PACKAGES: ${ic}${packages}${reset}
${c0} / \ / ${lc}SHELL: ${ic}${shell}${reset}
${c0} /-_____-\ ${lc}WM: ${ic}${WM}${reset}
${c0} /-_____-\ ${lc}${envtype}: ${ic}${WM}${reset}
EOF