From 0fca1ff3c703e814392b442286686be1fdfa5411 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Wed, 16 Mar 2016 17:12:21 +1100 Subject: [PATCH 1/2] added /usr/share as a gtk theme directory --- neofetch | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 4a185c30..689cca14 100755 --- a/neofetch +++ b/neofetch @@ -1399,6 +1399,9 @@ getstyle () { elif [ -f "/etc/gtk-2.0/gtkrc" ]; then gtk2theme=$(grep "^[^#]*$name" /etc/gtk-2.0/gtkrc) + + elif [ -f "/usr/share/gtk-2.0/gtkrc" ]; then + gtk2theme=$(grep "^[^#]*$name" /usr/share/gtk-2.0/gtkrc) fi gtk2theme=${gtk2theme/${name}*=} @@ -1414,8 +1417,11 @@ getstyle () { gtk3theme="$(gsettings get org.gnome.desktop.interface $gsettings)" gtk3theme=${gtk3theme//\'} - else + elif [ -f "/etc/gtk-3.0/settings.ini" ]; then gtk3theme=$(grep "^[^#]*$name" /etc/gtk-3.0/settings.ini) + + elif [ -f "/usr/share/gtk-3.0/settings.ini" ]; then + gtk3theme=$(grep "^[^#]*$name" /usr/share/gtk-3.0/settings.ini) fi gtk3theme=${gtk3theme/${name}*=} From 151eb544f4baef89cb7877365bb01d685a7c4885 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Wed, 16 Mar 2016 17:27:45 +1100 Subject: [PATCH 2/2] moved /usr/share to before /etc in gtk theme --- neofetch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 689cca14..c4c67d34 100755 --- a/neofetch +++ b/neofetch @@ -1397,11 +1397,11 @@ getstyle () { if [ -f "$HOME/.gtkrc-2.0" ]; then gtk2theme=$(grep "^[^#]*$name" "$HOME/.gtkrc-2.0") - elif [ -f "/etc/gtk-2.0/gtkrc" ]; then - gtk2theme=$(grep "^[^#]*$name" /etc/gtk-2.0/gtkrc) - elif [ -f "/usr/share/gtk-2.0/gtkrc" ]; then gtk2theme=$(grep "^[^#]*$name" /usr/share/gtk-2.0/gtkrc) + + elif [ -f "/etc/gtk-2.0/gtkrc" ]; then + gtk2theme=$(grep "^[^#]*$name" /etc/gtk-2.0/gtkrc) fi gtk2theme=${gtk2theme/${name}*=} @@ -1417,11 +1417,11 @@ getstyle () { gtk3theme="$(gsettings get org.gnome.desktop.interface $gsettings)" gtk3theme=${gtk3theme//\'} - elif [ -f "/etc/gtk-3.0/settings.ini" ]; then - gtk3theme=$(grep "^[^#]*$name" /etc/gtk-3.0/settings.ini) - elif [ -f "/usr/share/gtk-3.0/settings.ini" ]; then gtk3theme=$(grep "^[^#]*$name" /usr/share/gtk-3.0/settings.ini) + + elif [ -f "/etc/gtk-3.0/settings.ini" ]; then + gtk3theme=$(grep "^[^#]*$name" /etc/gtk-3.0/settings.ini) fi gtk3theme=${gtk3theme/${name}*=}