Hoping to fix GTK3 detection in issue #639.

This commit is contained in:
KittyKatt
2019-10-06 21:21:52 -05:00
parent a7d06fe526
commit c6a981a39f

View File

@@ -2799,19 +2799,21 @@ detectgtk () {
fi
fi
# Proper gtk3 Theme detection
if type -p gsettings >/dev/null 2>&1; then
gtk3Theme=$(gsettings get org.gnome.desktop.interface gtk-theme 2>/dev/null)
gtk3Theme=${gtk3Theme//"'"}
fi
# EXPERIMENTAL gtk3 Theme detection
if [[ -z "$gtk3Theme" && -f "$HOME/.config/gtk-3.0/settings.ini" ]]; then
if [[ "$gtk3Theme" = "Not Found" && -f "$HOME/.config/gtk-3.0/settings.ini" ]]; then
if grep -q 'gtk-theme-name' "$HOME/.config/gtk-3.0/settings.ini"; then
gtk3Theme=$(awk -F'=' '/^gtk-theme-name/ {print $2}' "$HOME/.config/gtk-3.0/settings.ini")
fi
fi
# Proper gtk3 Theme detection
if type -p gsettings >/dev/null 2>&1; then
if [ -z "$gtk3Theme" || "$gtk3Theme" = "Not Found" ]; then
gtk3Theme=$(gsettings get org.gnome.desktop.interface gtk-theme 2>/dev/null)
gtk3Theme=${gtk3Theme//"'"}
fi
fi
# ROX-Filer icon detect only
if [ -a "${XDG_CONFIG_HOME:-${HOME}/.config}/rox.sourceforge.net/ROX-Filer/Options" ]; then
gtkIcons=$(awk -F'[>,<]' '/icon_theme/ {print $3}' "${XDG_CONFIG_HOME:-${HOME}/.config}/rox.sourceforge.net/ROX-Filer/Options")