From e4dffc46736cf06c641146db33d3a6e3a6d73182 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Mon, 22 Jul 2019 00:18:04 +0200 Subject: [PATCH 1/5] The K Desktop Environment was renamed to Plasma --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 91aebf7c..38cf4ded 100755 --- a/neofetch +++ b/neofetch @@ -1516,6 +1516,7 @@ get_de() { de="${XDG_CURRENT_DESKTOP/X\-}" de="${de/Budgie:GNOME/Budgie}" de="${de/:Unity7:ubuntu}" + de="${de/KDE/Plasma}" elif [[ "$DESKTOP_SESSION" ]]; then de="${DESKTOP_SESSION##*/}" @@ -1544,7 +1545,7 @@ get_de() { # Format strings. case "$de" in - "KDE_SESSION_VERSION"*) de="KDE${de/* = }" ;; + "KDE_SESSION_VERSION"*) de="Plasma${de/* = }" ;; *"xfce4"*) de="Xfce4" ;; *"xfce5"*) de="Xfce5" ;; *"xfce"*) de="Xfce" ;; From 11dfe8d0163841931fc08944879ec35a780cfde5 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Mon, 22 Jul 2019 13:12:33 +0200 Subject: [PATCH 2/5] Only use Plasma instead of KDE, if KDE version is greater equal 4 --- neofetch | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 38cf4ded..0e799a4b 100755 --- a/neofetch +++ b/neofetch @@ -1516,7 +1516,6 @@ get_de() { de="${XDG_CURRENT_DESKTOP/X\-}" de="${de/Budgie:GNOME/Budgie}" de="${de/:Unity7:ubuntu}" - de="${de/KDE/Plasma}" elif [[ "$DESKTOP_SESSION" ]]; then de="${DESKTOP_SESSION##*/}" @@ -1531,6 +1530,10 @@ 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 From cc491fc59303501187d8ef6d94ee56322bc0902e Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Mon, 22 Jul 2019 15:15:31 +0200 Subject: [PATCH 3/5] 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 } From 1daac57e979c200d5cca3952c07c2ab522d3b265 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Tue, 23 Jul 2019 10:53:10 +0200 Subject: [PATCH 4/5] Use bash syntax --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index c2ac8c22..a22bacca 100755 --- a/neofetch +++ b/neofetch @@ -1560,9 +1560,10 @@ get_de() { ;; esac - if [ "$KDE_SESSION_VERSION" -ge "4" ]; then + if (( "$KDE_SESSION_VERSION" >= "4" )); then de="${de/KDE/Plasma}" fi + # Log that the function was run. de_run=1 } From af6160fbce990c9e9a2a09a05023aa1ce2cc60d2 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Tue, 23 Jul 2019 10:56:10 +0200 Subject: [PATCH 5/5] Use && --- neofetch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/neofetch b/neofetch index a22bacca..4eb6db0b 100755 --- a/neofetch +++ b/neofetch @@ -1560,9 +1560,7 @@ get_de() { ;; esac - if (( "$KDE_SESSION_VERSION" >= "4" )); then - de="${de/KDE/Plasma}" - fi + (( "$KDE_SESSION_VERSION" >= "4" )) && de="${de/KDE/Plasma}" # Log that the function was run. de_run=1