From 6f1ae617ff60bb9251b0b8c14aa763d829639158 Mon Sep 17 00:00:00 2001 From: edward-p Date: Mon, 1 Apr 2019 00:03:02 +0800 Subject: [PATCH 1/3] Handle ${GTK2_RC_FILES} with multiple values --- neofetch | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 55e53238..27ce9b0b 100755 --- a/neofetch +++ b/neofetch @@ -2683,8 +2683,15 @@ get_style() { # Check for general GTK2 Theme. if [[ -z "$gtk2_theme" ]]; then - if [[ -f "${GTK2_RC_FILES:-${HOME}/.gtkrc-2.0}" ]]; then - gtk2_theme="$(grep "^[^#]*${name}" "${GTK2_RC_FILES:-${HOME}/.gtkrc-2.0}")" + if [[ -n "${GTK2_RC_FILES}" ]]; then + for gtkrc in ${GTK2_RC_FILES//:/ }; do + _gtk2_theme="$(grep "^[^#]*${name}" "${gtkrc}")" + [[ -n "${_gtk2_theme}" ]] && gtk2_theme="${_gtk2_theme}" + done + unset _gtk2_theme + + elif [[ -f "${HOME}/.gtkrc-2.0" ]]; then + gtk2_theme="$(grep "^[^#]*${name}" "${HOME}/.gtkrc-2.0")" elif [[ -f "/etc/gtk-2.0/gtkrc" ]]; then gtk2_theme="$(grep "^[^#]*${name}" /etc/gtk-2.0/gtkrc)" From 836197fc2e24ee0b7d63b358c77100eea80c42af Mon Sep 17 00:00:00 2001 From: edward-p Date: Fri, 3 May 2019 02:27:59 +0800 Subject: [PATCH 2/3] make some changes --- neofetch | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 27ce9b0b..fb94116f 100755 --- a/neofetch +++ b/neofetch @@ -2684,12 +2684,8 @@ get_style() { # Check for general GTK2 Theme. if [[ -z "$gtk2_theme" ]]; then if [[ -n "${GTK2_RC_FILES}" ]]; then - for gtkrc in ${GTK2_RC_FILES//:/ }; do - _gtk2_theme="$(grep "^[^#]*${name}" "${gtkrc}")" - [[ -n "${_gtk2_theme}" ]] && gtk2_theme="${_gtk2_theme}" - done - unset _gtk2_theme - + IFS=: read -ra rc_files <<< "$GTK2_RC_FILES" + gtk2_theme="$(grep "^[^#]*${name}" "${rc_files[@]}")" elif [[ -f "${HOME}/.gtkrc-2.0" ]]; then gtk2_theme="$(grep "^[^#]*${name}" "${HOME}/.gtkrc-2.0")" @@ -2701,7 +2697,7 @@ get_style() { fi - gtk2_theme="${gtk2_theme/${name}*=}" + gtk2_theme="${gtk2_theme/*${name}*=}" fi # Check for general GTK3 Theme. From d128f1cf1e95b06d89a0a43328e582e05c456313 Mon Sep 17 00:00:00 2001 From: edward-p Date: Fri, 3 May 2019 16:28:22 +0800 Subject: [PATCH 3/3] use "$GTK2_RC_FILES" --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index fb94116f..60c5cbe2 100755 --- a/neofetch +++ b/neofetch @@ -2683,7 +2683,7 @@ get_style() { # Check for general GTK2 Theme. if [[ -z "$gtk2_theme" ]]; then - if [[ -n "${GTK2_RC_FILES}" ]]; then + if [[ -n "$GTK2_RC_FILES" ]]; then IFS=: read -ra rc_files <<< "$GTK2_RC_FILES" gtk2_theme="$(grep "^[^#]*${name}" "${rc_files[@]}")" elif [[ -f "${HOME}/.gtkrc-2.0" ]]; then