From 33256b2640fc1a1dad2fe3a717220ecedd9d9a01 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Wed, 12 Jul 2017 10:13:46 +0200 Subject: [PATCH 1/3] Theme: Fix detection on KDE Partial fix for #766 --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index f795747a..4a5758ca 100755 --- a/neofetch +++ b/neofetch @@ -1530,7 +1530,7 @@ get_style() { if [[ -f "${kde_config_dir}/kdeglobals" ]]; then kde_config_file="${kde_config_dir}/kdeglobals" - theme="$(grep "^[^#]*${kde}" "$kde_config_file")" + theme="$(grep "^${kde}" "$kde_config_file")" theme="${theme/${kde}*=}" theme="$(uppercase "$theme")" @@ -1648,7 +1648,7 @@ get_theme() { gsettings="gtk-theme" gconf="gtk_theme" xfconf="/Net/ThemeName" - kde="widgetStyle" + kde="Name" get_style } From 9f5ab665c93f3d2abd289f532f38cf0c774db6e7 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Wed, 12 Jul 2017 17:07:09 +0200 Subject: [PATCH 2/3] WM Theme [KDE]: Fix detection of Aurorae themes Aurorae themes were detected as kwin.aurorae because the name was taken from library= instead of theme= in kwinrc. #766 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 4a5758ca..8450bc4f 100755 --- a/neofetch +++ b/neofetch @@ -778,7 +778,7 @@ get_wm_theme() { kde_config_dir if [[ -f "${kde_config_dir}/kwinrc" ]]; then - wm_theme="$(awk '/theme=kwin4/{gsub(/theme=kwin4_decoration_qml_/,"",$0); print $0; exit}' "${kde_config_dir}/kwinrc")" + wm_theme="$(awk '/theme=/{gsub(/theme=.*_/,"",$0); print $0; exit}' "${kde_config_dir}/kwinrc")" [[ -z "$wm_theme" ]] && wm_theme="$(awk '/library=org.kde/{gsub(/library=org.kde./,"",$0); print $0; exit}' "${kde_config_dir}/kwinrc")" [[ -z "$wm_theme" ]] && wm_theme="$(awk '/PluginLib=kwin3_/{gsub(/PluginLib=kwin3_/,"",$0); print $0; exit}' "${kde_config_dir}/kwinrc")" From 94b9b3ad0c8f06495528c2cef06900392ba4a49d Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Wed, 12 Jul 2017 19:49:00 +0200 Subject: [PATCH 3/3] WM Theme [KDE]: Fix Aurorae themes For themes with underscores in the name, only the last part was displayed. #766 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 8450bc4f..8fff62fe 100755 --- a/neofetch +++ b/neofetch @@ -778,7 +778,7 @@ get_wm_theme() { kde_config_dir if [[ -f "${kde_config_dir}/kwinrc" ]]; then - wm_theme="$(awk '/theme=/{gsub(/theme=.*_/,"",$0); print $0; exit}' "${kde_config_dir}/kwinrc")" + wm_theme="$(awk '/theme=/{gsub(/theme=.*qml_|theme=.*svg__/,"",$0); print $0; exit}' "${kde_config_dir}/kwinrc")" [[ -z "$wm_theme" ]] && wm_theme="$(awk '/library=org.kde/{gsub(/library=org.kde./,"",$0); print $0; exit}' "${kde_config_dir}/kwinrc")" [[ -z "$wm_theme" ]] && wm_theme="$(awk '/PluginLib=kwin3_/{gsub(/PluginLib=kwin3_/,"",$0); print $0; exit}' "${kde_config_dir}/kwinrc")"