From cc491fc59303501187d8ef6d94ee56322bc0902e Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Mon, 22 Jul 2019 15:15:31 +0200 Subject: [PATCH] Move check plasma >= 4 after de to KDE and revert some change --- neofetch | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 0e799a4b..c2ac8c22 100755 --- a/neofetch +++ b/neofetch @@ -1530,10 +1530,6 @@ get_de() { de="Trinity" fi - if [ "$KDE_SESSION_VERSION" -ge "4" ]; then - de="${de/KDE/Plasma}" - fi - # When a window manager is started from a display manager # the desktop variables are sometimes also set to the # window manager name. This checks to see if WM == DE @@ -1548,7 +1544,7 @@ get_de() { # Format strings. case "$de" in - "KDE_SESSION_VERSION"*) de="Plasma${de/* = }" ;; + "KDE_SESSION_VERSION"*) de="KDE${de/* = }" ;; *"xfce4"*) de="Xfce4" ;; *"xfce5"*) de="Xfce5" ;; *"xfce"*) de="Xfce" ;; @@ -1564,6 +1560,9 @@ get_de() { ;; esac + if [ "$KDE_SESSION_VERSION" -ge "4" ]; then + de="${de/KDE/Plasma}" + fi # Log that the function was run. de_run=1 }