EvolutionOS
/
neofetch
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #588 from mstraube/kde 

Fix WM Theme detection for KDE5, closes #586
This commit is contained in:
Dylan Araps 2017-01-04 08:27:36 +11:00 committed by GitHub
parent 8cc55e56c5 5ef29eb2b5
commit 847706befd
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
neofetch
View File

@ -688,13 +688,14 @@ get_wm_theme() {
"KWin"*) "KWin"*)
kde_config_dir kde_config_dir
kde_config_dir="${kde_config_dir%/}"
if [[ -f "$kde_config_dir/share/config/kwinrc" ]]; then if [[ -f "${kde_config_dir}/kwinrc" ]]; then
wm_theme="$(awk '/PluginLib=kwin3_/{gsub(/PluginLib=kwin3_/,"",$0); print $0; exit}' "$kde_config_dir/share/config/kwinrc")" wm_theme="$(awk '/theme=kwin4/{gsub(/theme=kwin4_decoration_qml_/,"",$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")"
elif [[ -f "$kde_config_dir/share/config/kdebugrc" ]]; then elif [[ -f "${kde_config_dir}/kdebugrc" ]]; then
wm_theme="$(awk '/(decoration)/ {gsub(/\[/,"",$1); print $1; exit}' "$kde_config_dir/share/config/kdebugrc")" wm_theme="$(awk '/(decoration)/ {gsub(/\[/,"",$1); print $1; exit}' "${kde_config_dir}/kdebugrc")"
fi fi
;; ;;
@ -1355,8 +1356,8 @@ get_style() {
"KDE"*) "KDE"*)
kde_config_dir kde_config_dir
if [[ -f "${kde_config_dir}/share/config/kdeglobals" ]]; then if [[ -f "${kde_config_dir}/kdeglobals" ]]; then
kde_config_file="${kde_config_dir}/share/config/kdeglobals" kde_config_file="${kde_config_dir}/kdeglobals"
theme="$(grep "^[^#]*${kde}" "$kde_config_file")" theme="$(grep "^[^#]*${kde}" "$kde_config_file")"
theme="${theme/${kde}*=}" theme="${theme/${kde}*=}"
@ -3227,21 +3228,23 @@ kde_config_dir() {
if [[ "$kde_config_dir" ]]; then if [[ "$kde_config_dir" ]]; then
return return
elif [[ -n "$KDE_CONFIG_DIR" ]]; then elif type -p kf5-config >/dev/null 2>&1; then
kde_config_dir="$KDE_CONFIG_DIR" kde_config_dir="$(kf5-config --path config)"
elif type -p kde4-config >/dev/null 2>&1; then elif type -p kde4-config >/dev/null 2>&1; then
kde_config_dir="$(kde4-config --localprefix)" kde_config_dir="$(kde4-config --path config)"
elif type -p kde-config >/dev/null 2>&1; then elif type -p kde-config >/dev/null 2>&1; then
kde_config_dir="$(kde-config --localprefix)" kde_config_dir="$(kde-config --path config)"
elif [[ -d "${HOME}/.kde4" ]]; then elif [[ -d "${HOME}/.kde4" ]]; then
kde_config_dir="${HOME}/.kde4" kde_config_dir="${HOME}/.kde4/share/config"
elif [[ -d "${HOME}/.kde3" ]]; then elif [[ -d "${HOME}/.kde3" ]]; then
kde_config_dir="${HOME}/.kde3" kde_config_dir="${HOME}/.kde3/share/config"
fi fi
kde_config_dir="${kde_config_dir/$'/:'*}"
} }
get_term_padding() { get_term_padding() {