From ebf55849877ae792fa373546d3ca0f869870a130 Mon Sep 17 00:00:00 2001
From: arcadius3d <arcadius@tuta.io>
Date: Tue, 17 Jul 2018 11:39:35 -0300
Subject: [PATCH] No 'WM:' for machines with no DE/WM

---
 ufetch-alpine   | 12 ++++++------
 ufetch-arch     | 12 ++++++------
 ufetch-crux     | 12 ++++++------
 ufetch-debian   | 12 ++++++------
 ufetch-fedora   | 12 ++++++------
 ufetch-freebsd  | 12 ++++++------
 ufetch-gentoo   | 12 ++++++------
 ufetch-linux    | 12 ++++++------
 ufetch-manjaro  | 12 ++++++------
 ufetch-nixos    | 12 ++++++------
 ufetch-openbsd  | 12 ++++++------
 ufetch-raspbian | 12 ++++++------
 ufetch-void     | 12 ++++++------
 13 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/ufetch-alpine b/ufetch-alpine
index 07883bf..50d6982 100755
--- a/ufetch-alpine
+++ b/ufetch-alpine
@@ -14,17 +14,17 @@ shell="$(basename ${SHELL})"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE'
+		envtype='DE:'
 		WM="${XDG_CURRENT_DESKTOP}"
 	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE'
+		envtype='DE:'
 		WM="${DESKTOP_SESSION}"
-	else
-		envtype='WM'
+	elif [ -f "${HOME}/.xinitrc" ]; then
+		envtype='WM:'
 		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	fi
 else
-	envtype='WM'
+	envtype='WM:'
 fi
 
 ## DEFINE COLORS
@@ -58,6 +58,6 @@ ${c0}   /${c1}/   ${c0}\  \     ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}  /${c1}//    ${c0}\  \    ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c0}  ${c1}//      ${c0}\  \   ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c0}           \  \  ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}            \    ${lc}${envtype}:        ${ic}${WM}${reset}
+${c0}            \    ${lc}${envtype}        ${ic}${WM}${reset}
 
 EOF
diff --git a/ufetch-arch b/ufetch-arch
index 609850c..0bcfa06 100755
--- a/ufetch-arch
+++ b/ufetch-arch
@@ -14,17 +14,17 @@ shell="$(basename ${SHELL})"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE'
+		envtype='DE:'
 		WM="${XDG_CURRENT_DESKTOP}"
 	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE'
+		envtype='DE:'
 		WM="${DESKTOP_SESSION}"
-	else
-		envtype='WM'
+	elif [ -f "${HOME}/.xinitrc" ]; then
+		envtype='WM:'
 		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	fi
 else
-	envtype='WM'
+	envtype='WM:'
 fi
 
 ## DEFINE COLORS
@@ -58,6 +58,6 @@ ${c0}      /\   \      ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}     /  ${c1}__  \     ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c1}    /  (  )  \    ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c1}   / __|  |__\\\\   ${lc}SHELL:     ${ic}${shell}${reset}
-${c1}  ///        \\\\\  ${lc}${envtype}:        ${ic}${WM}${reset}
+${c1}  ///        \\\\\  ${lc}${envtype}        ${ic}${WM}${reset}
 
 EOF
diff --git a/ufetch-crux b/ufetch-crux
index 36356b1..728489e 100755
--- a/ufetch-crux
+++ b/ufetch-crux
@@ -14,17 +14,17 @@ shell="$(basename ${SHELL})"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE'
+		envtype='DE:'
 		WM="${XDG_CURRENT_DESKTOP}"
 	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE'
+		envtype='DE:'
 		WM="${DESKTOP_SESSION}"
-	else
-		envtype='WM'
+	elif [ -f "${HOME}/.xinitrc" ]; then
+		envtype='WM:'
 		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	fi
 else
-	envtype='WM'
+	envtype='WM:'
 fi
 
 ## DEFINE COLORS
@@ -59,6 +59,6 @@ ${c0}     (${c2}<> ${c0}|    ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}    / ${c1}__  ${c0}\\   ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c0}   ( ${c1}/  \\ ${c0}/|  ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c2}  _${c0}/\\ ${c1}__)${c0}/${c2}_${c0})  ${lc}SHELL:     ${ic}${shell}${reset}
-${c2}  \/${c0}-____${c2}\/   ${lc}${envtype}:        ${ic}${WM}${reset}
+${c2}  \/${c0}-____${c2}\/   ${lc}${envtype}        ${ic}${WM}${reset}
 
 EOF
diff --git a/ufetch-debian b/ufetch-debian
index e5fa45b..5409d88 100755
--- a/ufetch-debian
+++ b/ufetch-debian
@@ -14,17 +14,17 @@ shell="$(basename ${SHELL})"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE'
+		envtype='DE:'
 		WM="${XDG_CURRENT_DESKTOP}"
 	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE'
+		envtype='DE:'
 		WM="${DESKTOP_SESSION}"
-	else
-		envtype='WM'
+	elif [ -f "${HOME}/.xinitrc" ]; then
+		envtype='WM:'
 		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	fi
 else
-	envtype='WM'
+	envtype='WM:'
 fi
 
 ## DEFINE COLORS
@@ -58,6 +58,6 @@ ${c0}  |  /    |  ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}  |  ${c1}\\___-   ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c1}  -_         ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c1}    --_      ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}             ${lc}${envtype}:        ${ic}${WM}${reset}
+${c0}             ${lc}${envtype}        ${ic}${WM}${reset}
 
 EOF
diff --git a/ufetch-fedora b/ufetch-fedora
index d649570..8a42daf 100755
--- a/ufetch-fedora
+++ b/ufetch-fedora
@@ -14,17 +14,17 @@ shell="$(basename ${SHELL})"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE'
+		envtype='DE:'
 		WM="${XDG_CURRENT_DESKTOP}"
 	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE'
+		envtype='DE:'
 		WM="${DESKTOP_SESSION}"
-	else
-		envtype='WM'
+	elif [ -f "${HOME}/.xinitrc" ]; then
+		envtype='WM:'
 		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	fi
 else
-	envtype='WM'
+	envtype='WM:'
 fi
 
 ## DEFINE COLORS
@@ -57,6 +57,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}${envtype}        ${ic}${WM}${reset}
 
 EOF
diff --git a/ufetch-freebsd b/ufetch-freebsd
index 2766f63..a0c12c7 100755
--- a/ufetch-freebsd
+++ b/ufetch-freebsd
@@ -14,17 +14,17 @@ shell="$(basename ${SHELL})"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE'
+		envtype='DE:'
 		WM="${XDG_CURRENT_DESKTOP}"
 	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE'
+		envtype='DE:'
 		WM="${DESKTOP_SESSION}"
-	else
-		envtype='WM'
+	elif [ -f "${HOME}/.xinitrc" ]; then
+		envtype='WM:'
 		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	fi
 else
-	envtype='WM'
+	envtype='WM:'
 fi
 
 ## DEFINE COLORS
@@ -58,6 +58,6 @@ ${c0}  \/       (__/  ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c1}  |           |  ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c1}  |           |  ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c1}   \         /   ${lc}SHELL:     ${ic}${shell}${reset}
-${c1}    \`-_____-\`    ${lc}${envtype}:        ${ic}${WM}${reset}
+${c1}    \`-_____-\`    ${lc}${envtype}        ${ic}${WM}${reset}
 
 EOF
diff --git a/ufetch-gentoo b/ufetch-gentoo
index bf015e4..edcd2ed 100755
--- a/ufetch-gentoo
+++ b/ufetch-gentoo
@@ -14,17 +14,17 @@ shell="$(basename ${SHELL})"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE'
+		envtype='DE:'
 		WM="${XDG_CURRENT_DESKTOP}"
 	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE'
+		envtype='DE:'
 		WM="${DESKTOP_SESSION}"
-	else
-		envtype='WM'
+	elif [ -f "${HOME}/.xinitrc" ]; then
+		envtype='WM:'
 		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	fi
 else
-	envtype='WM'
+	envtype='WM:'
 fi
 
 ## DEFINE COLORS
@@ -58,6 +58,6 @@ ${c0}   \`.   (${c1}_)   ${c0}\`.  ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}     \`${c1}.        /  ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c1}    .\`       .\`   ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c1}   /       .\`     ${lc}SHELL:     ${ic}${shell}${reset}
-${c1}   \____.-\`       ${lc}${envtype}:        ${ic}${WM}${reset}
+${c1}   \____.-\`       ${lc}${envtype}        ${ic}${WM}${reset}
 
 EOF
diff --git a/ufetch-linux b/ufetch-linux
index c57dc84..05c936b 100755
--- a/ufetch-linux
+++ b/ufetch-linux
@@ -13,17 +13,17 @@ shell="$(basename ${SHELL})"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE'
+		envtype='DE:'
 		WM="${XDG_CURRENT_DESKTOP}"
 	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE'
+		envtype='DE:'
 		WM="${DESKTOP_SESSION}"
-	else
-		envtype='WM'
+	elif [ -f "${HOME}/.xinitrc" ]; then
+		envtype='WM:'
 		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	fi
 else
-	envtype='WM'
+	envtype='WM:'
 fi
 
 ## DEFINE COLORS
@@ -57,7 +57,7 @@ ${c0}     (${c1}.. ${c0}\    ${lc}OS:        ${ic}${os}${reset}
 ${c0}     (${c2}<> ${c0}|    ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c0}    /${c1}/  \\ ${c0}\\   ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c0}   ( ${c1}|  | ${c0}/|  ${lc}SHELL:     ${ic}${shell}${reset}
-${c2}  _${c0}/\\ ${c1}__)${c0}/${c2}_${c0})  ${lc}${envtype}:        ${ic}${WM}${reset}
+${c2}  _${c0}/\\ ${c1}__)${c0}/${c2}_${c0})  ${lc}${envtype}        ${ic}${WM}${reset}
 ${c2}  \/${c0}-____${c2}\/${reset}
 
 EOF
diff --git a/ufetch-manjaro b/ufetch-manjaro
index 4a10c30..a9e7060 100755
--- a/ufetch-manjaro
+++ b/ufetch-manjaro
@@ -14,17 +14,17 @@ shell="$(basename ${SHELL})"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE'
+		envtype='DE:'
 		WM="${XDG_CURRENT_DESKTOP}"
 	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE'
+		envtype='DE:'
 		WM="${DESKTOP_SESSION}"
-	else
-		envtype='WM'
+	elif [ -f "${HOME}/.xinitrc" ]; then
+		envtype='WM:'
 		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	fi
 else
-	envtype='WM'
+	envtype='WM:'
 fi
 
 ## DEFINE COLORS
@@ -57,6 +57,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}${envtype}        ${ic}${WM}${reset}
 
 EOF
diff --git a/ufetch-nixos b/ufetch-nixos
index 6b90bf2..63b4576 100755
--- a/ufetch-nixos
+++ b/ufetch-nixos
@@ -14,17 +14,17 @@ shell="$(basename ${SHELL})"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE'
+		envtype='DE:'
 		WM="${XDG_CURRENT_DESKTOP}"
 	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE'
+		envtype='DE:'
 		WM="${DESKTOP_SESSION}"
-	else
-		envtype='WM'
+	elif [ -f "${HOME}/.xinitrc" ]; then
+		envtype='WM:'
 		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	fi
 else
-	envtype='WM'
+	envtype='WM:'
 fi
 
 ## DEFINE COLORS
@@ -58,6 +58,6 @@ ${c1}     //    \\${c0}//   ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c1}  ==//      ${c0}//==  ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c1}   //${c0}\\${c1}____${c0}//     ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c1}  // ${c0}/\\   ${c1}\\==   ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}    // \\   ${c1}\\    ${lc}${envtype}:        ${ic}${WM}${reset}
+${c0}    // \\   ${c1}\\    ${lc}${envtype}        ${ic}${WM}${reset}
 
 EOF
diff --git a/ufetch-openbsd b/ufetch-openbsd
index f46873e..cc24245 100755
--- a/ufetch-openbsd
+++ b/ufetch-openbsd
@@ -14,17 +14,17 @@ shell="$(basename ${SHELL})"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE'
+		envtype='DE:'
 		WM="${XDG_CURRENT_DESKTOP}"
 	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE'
+		envtype='DE:'
 		WM="${DESKTOP_SESSION}"
-	else
-		envtype='WM'
+	elif [ -f "${HOME}/.xinitrc" ]; then
+		envtype='WM:'
 		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	fi
 else
-	envtype='WM'
+	envtype='WM:'
 fi
 
 ## DEFINE COLORS
@@ -60,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}${envtype}:        ${ic}${WM}${reset}
+${c0}     /-_____-\    ${lc}${envtype}        ${ic}${WM}${reset}
 
 EOF
diff --git a/ufetch-raspbian b/ufetch-raspbian
index 23f5c26..050d2f9 100755
--- a/ufetch-raspbian
+++ b/ufetch-raspbian
@@ -14,17 +14,17 @@ shell="$(basename ${SHELL})"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE'
+		envtype='DE:'
 		WM="${XDG_CURRENT_DESKTOP}"
 	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE'
+		envtype='DE:'
 		WM="${DESKTOP_SESSION}"
-	else
-		envtype='WM'
+	elif [ -f "${HOME}/.xinitrc" ]; then
+		envtype='WM:'
 		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	fi
 else
-	envtype='WM'
+	envtype='WM:'
 fi
 
 ## DEFINE COLORS
@@ -58,6 +58,6 @@ ${c1}   (_(__)_)   ${lc}KERNEL:    ${ic}${kernel}${reset}
 ${c1}  (_(_)(_)_)  ${lc}UPTIME:    ${ic}${uptime}${reset}
 ${c1}   (_(__)_)   ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c1}     (__)     ${lc}SHELL:     ${ic}${shell}${reset}
-${c1}              ${lc}${envtype}:        ${ic}${WM}${reset}
+${c1}              ${lc}${envtype}        ${ic}${WM}${reset}
 
 EOF
diff --git a/ufetch-void b/ufetch-void
index 18ce239..a2ea5e4 100755
--- a/ufetch-void
+++ b/ufetch-void
@@ -14,17 +14,17 @@ shell="$(basename ${SHELL})"
 
 if [ -z "${WM}" ]; then
 	if [ "${XDG_CURRENT_DESKTOP}" ]; then
-		envtype='DE'
+		envtype='DE:'
 		WM="${XDG_CURRENT_DESKTOP}"
 	elif [ "${DESKTOP_SESSION}" ]; then
-		envtype='DE'
+		envtype='DE:'
 		WM="${DESKTOP_SESSION}"
-	else
-		envtype='WM'
+	elif [ -f "${HOME}/.xinitrc" ]; then
+		envtype='WM:'
 		WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	fi
 else
-	envtype='WM'
+	envtype='WM:'
 fi
 
 ## DEFINE COLORS
@@ -58,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}${envtype}:        ${ic}${WM}${reset}
+${c1}    \`-______\      ${lc}${envtype}        ${ic}${WM}${reset}
 
 EOF