From 45b96fa55036ea674a5d1698af759e0cd5749a7a Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 28 Jan 2016 11:34:41 +1100 Subject: [PATCH] Fix gtk3 theme detection --- fetch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fetch b/fetch index ff5faef0..2e432bfd 100755 --- a/fetch +++ b/fetch @@ -357,6 +357,7 @@ case "$os" in ;; "Mac OS X") + # distro="Mac OS X $(sw_vers -productVersion -buildVersion)" distro="Mac OS X $(sw_vers -productVersion)" ;; @@ -1011,13 +1012,13 @@ getgtk () { # Check for gtk3 theme if [ "$gtk3" == "on" ]; then - if type -p gsettings >/dev/null 2>&1; then + if [ -f "$HOME/.config/gtk-3.0/settings.ini" ]; then + gtk3theme=$(grep "^[^#]*$name" "$HOME/.config/gtk-3.0/settings.ini") + + elif type -p gsettings >/dev/null 2>&1; then gtk3theme="$(gsettings get org.gnome.desktop.interface $gsettings)" gtk3theme=${gtk3theme//\'} - elif [ -f "$HOME/.config/gtk-3.0/settings.ini" ]; then - gtk3theme=$(grep "^[^#]*$name" "$HOME/.config/gtk-3.0/settings.ini") - else gtk3theme=$(grep "^[^#]*$name" /etc/gtk-3.0/settings.ini) fi