Merge pull request #441 from dylanaraps/gtk

Style: Cleanup get_style

neofetch

@@ -175,8 +175,7 @@ get_distro() {
                 [[ -z "${distro// }" ]] && distro="$(awk '/BLAG/ {print $1; exit}' /etc/*ease /usr/lib/*ease)"
                 [[ -z "${distro// }" ]] && distro="$(awk -F'=' '{print $2; exit}' /etc/*ease /usr/lib/*ease)"
             fi
-            distro="${distro//\"}"
+            distro="$(trim_quotes "$distro")"
-            distro="${distro//\'}"
         ;;
 
         "Mac OS X")
@@ -529,9 +528,8 @@ get_wm() {
         wm="${wm/\"*}"
 
         # Fallback for Wayland wms
-        case "$wm" in
+        [[ "$wm" == "xwlc" ]] && \
-            "xwlc") wm="$(ps -e | grep -m 1 -o -F -e "sway" -e "orbment" -e "velox" -e "orbital")" ;;
+            wm="$(ps -e | grep -m 1 -o -F -e "sway" -e "orbment" -e "velox" -e "orbital")"
-        esac
 
     else
         case "$os" in
@@ -660,8 +658,8 @@ get_wm_theme() {
         ;;
     esac
 
-    wm_theme="${wm_theme//\'}"
+    wm_theme="$(trim_quotes "$wm_theme")"
-    (("$bash_version" >= 4)) && wm_theme="${wm_theme^}"
+    wm_theme="$(uppercase "$wm_theme")"
 }
 
 get_cpu() {
@@ -981,7 +979,7 @@ get_gpu() {
                 "FreeBSD"* | "DragonFlyBSD"* | "PacBSD"*)
                     gpu="$(pciconf -lv | grep -B 4 -F "VGA" | grep -F "device")"
                     gpu="${gpu/*device*= }"
-                    gpu="${gpu//\'}"
+                    gpu="$(trim_quotes "$gpu")"
                 ;;
 
                 *)
@@ -1136,7 +1134,7 @@ get_song() {
             state="$(dbus-send --print-reply --dest=org.mpris.MediaPlayer2.rhythmbox /org/mpris/MediaPlayer2 \
                      org.freedesktop.DBus.Properties.Get string:'org.mpris.MediaPlayer2.Player' string: 'PlayBackStatus' |\
                      awk -F 'string "' '{printf $2}')"
-            state="${state//\"}"
+            state="$(trim_quotes "$state")"
         ;;
 
         "banshee"*)
@@ -1272,38 +1270,13 @@ get_resolution() {
 get_style() {
     # Fix weird output when the function
     # is run multiple times.
-    unset gtk2theme gtk3theme theme path
+    unset gtk2_theme gtk3_theme theme path
-
-    case "$1" in
-        "theme")
-            name="gtk-theme-name"
-            gsettings="gtk-theme"
-            gconf="gtk_theme"
-            xfconf="/Net/ThemeName"
-            kde="widgetStyle"
-        ;;
-
-        "icons")
-            name="gtk-icon-theme-name"
-            gsettings="icon-theme"
-            gconf="icon_theme"
-            xfconf="/Net/IconThemeName"
-            kde="Theme"
-        ;;
-
-        "font")
-            name="gtk-font-name"
-            gsettings="font-name"
-            gconf="font_theme"
-            xfconf="/Gtk/FontName"
-            kde="font"
-        ;;
-    esac
 
     if [[ -n "$DISPLAY" && "$os" != "Mac OS X" ]]; then
         # Get DE if user has disabled the function.
         [[ -z "$de" ]] && get_de
 
+        # Check for DE Theme.
         case "$de" in
             "KDE"*)
                 kde_config_dir
@@ -1313,7 +1286,7 @@ get_style() {
 
                     theme="$(grep "^[^#]*$kde" "$kde_config_file")"
                     theme="${theme/${kde}*=}"
-                    (("$bash_version" >= 4)) && theme="${theme^}"
+                    theme="$(uppercase "$theme")"
 
                     gtk_shorthand="on"
                     return
@@ -1322,121 +1295,135 @@ get_style() {
 
             *"Cinnamon")
                 if type -p gsettings >/dev/null; then
-                    gtk3theme="$(gsettings get org.cinnamon.desktop.interface "$gsettings")"
+                    gtk3_theme="$(gsettings get org.cinnamon.desktop.interface "$gsettings")"
-                    gtk2theme="${gtk3theme}"
+                    gtk2_theme="$gtk3_theme"
                 fi
             ;;
 
             "Gnome"* | "Unity"* | "Budgie"*)
                 if type -p gsettings >/dev/null; then
-                    gtk3theme="$(gsettings get org.gnome.desktop.interface "$gsettings")"
+                    gtk3_theme="$(gsettings get org.gnome.desktop.interface "$gsettings")"
-                    gtk2theme="${gtk3theme}"
+                    gtk2_theme="$gtk3_theme"
 
                 elif type -p gconftool-2 >/dev/null; then
-                    gtk2theme="$(gconftool-2 -g /desktop/gnome/interface/"$gconf")"
+                    gtk2_theme="$(gconftool-2 -g /desktop/gnome/interface/"$gconf")"
                 fi
             ;;
 
             "Mate"*)
-                gtk3theme="$(gsettings get org.mate.interface "$gsettings")"
+                gtk3_theme="$(gsettings get org.mate.interface "$gsettings")"
-                gtk2theme="${gtk3theme}"
+                gtk2_theme="$gtk3_theme"
             ;;
 
             "Xfce"*)
                 type -p xfconf-query >/dev/null && \
-                    gtk2theme="$(xfconf-query -c xsettings -p "$xfconf")"
+                    gtk2_theme="$(xfconf-query -c xsettings -p "$xfconf")"
             ;;
         esac
 
-        # Check for gtk2 theme
+        # Check for general GTK2 Theme
-        if [[ -z "$gtk2theme" ]]; then
+        if [[ -z "$gtk2_theme" ]]; then
             if [[ -f "${GTK2_RC_FILES:-$HOME/.gtkrc-2.0}" ]]; then
-                gtk2theme="$(grep "^[^#]*$name" "${GTK2_RC_FILES:-$HOME/.gtkrc-2.0}")"
+                gtk2_theme="$(grep "^[^#]*${name}" "${GTK2_RC_FILES:-$HOME/.gtkrc-2.0}")"
 
             elif [[ -f "/usr/share/gtk-2.0/gtkrc" ]]; then
-                gtk2theme="$(grep "^[^#]*$name" /usr/share/gtk-2.0/gtkrc)"
+                gtk2_theme="$(grep "^[^#]*${name}" /usr/share/gtk-2.0/gtkrc)"
 
             elif [[ -f "/etc/gtk-2.0/gtkrc" ]]; then
-                gtk2theme="$(grep "^[^#]*$name" /etc/gtk-2.0/gtkrc)"
+                gtk2_theme="$(grep "^[^#]*${name}" /etc/gtk-2.0/gtkrc)"
             fi
 
-            gtk2theme="${gtk2theme/${name}*=}"
+            gtk2_theme="${gtk2_theme/${name}*=}"
         fi
 
-        # Check for gtk3 theme
+        # Check for general GTK3 Theme
-        if [[ -z "$gtk3theme" ]]; then
+        if [[ -z "$gtk3_theme" ]]; then
             if [[ -f "$XDG_CONFIG_HOME/gtk-3.0/settings.ini" ]]; then
-                gtk3theme="$(grep "^[^#]*$name" "$XDG_CONFIG_HOME/gtk-3.0/settings.ini")"
+                gtk3_theme="$(grep "^[^#]*$name" "$XDG_CONFIG_HOME/gtk-3.0/settings.ini")"
 
             elif type -p gsettings >/dev/null; then
-                gtk3theme="$(gsettings get org.gnome.desktop.interface "$gsettings")"
+                gtk3_theme="$(gsettings get org.gnome.desktop.interface "$gsettings")"
 
             elif [[ -f "/usr/share/gtk-3.0/settings.ini" ]]; then
-                gtk3theme="$(grep "^[^#]*$name" /usr/share/gtk-3.0/settings.ini)"
+                gtk3_theme="$(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)"
+                gtk3_theme="$(grep "^[^#]*$name" /etc/gtk-3.0/settings.ini)"
             fi
 
-            gtk3theme="${gtk3theme/${name}*=}"
+            gtk3_theme="${gtk3_theme/${name}*=}"
         fi
 
-        # Remove quotes
-        gtk2theme=${gtk2theme//\"}
-        gtk2theme=${gtk2theme//\'}
-        gtk3theme=${gtk3theme//\"}
-        gtk3theme=${gtk3theme//\'}
-
-        # Uppercase the first letter of each gtk theme
-        if (("$bash_version" >= 4)); then
-            gtk2theme="${gtk2theme^}"
-            gtk3theme="${gtk3theme^}"
-        fi
-
-        # Toggle visibility of gtk themes.
-        [[ "$gtk2" == "off" ]] && unset gtk2theme
-        [[ "$gtk3" == "off" ]] && unset gtk3theme
-
         # Trim whitespace
-        gtk2theme="$(trim "$gtk2theme")"
+        gtk2_theme="$(trim "$gtk2_theme")"
-        gtk3theme="$(trim "$gtk3theme")"
+        gtk3_theme="$(trim "$gtk3_theme")"
+
+        # Remove quotes
+        gtk2_theme="$(trim_quotes "$gtk2_theme")"
+        gtk3_theme="$(trim_quotes "$gtk3_theme")"
+
+        # Uppercase the first letter of each gtk theme
+        gtk2_theme="$(uppercase "$gtk2_theme")"
+        gtk3_theme="$(uppercase "$gtk3_theme")"
+
+        # Toggle visibility of gtk themes.
+        [[ "$gtk2" == "off" ]] && unset gtk2_theme
+        [[ "$gtk3" == "off" ]] && unset gtk3_theme
 
         # Format the string based on which themes exist
-        if  [[ "$gtk2theme" && "$gtk2theme" == "$gtk3theme" ]]; then
+        if  [[ "$gtk2_theme" && "$gtk2_theme" == "$gtk3_theme" ]]; then
-            gtk3theme+=" [GTK2/3]"
+            gtk3_theme+=" [GTK2/3]"
-            unset gtk2theme
+            unset gtk2_theme
+
+        elif [[ "$gtk2_theme" && "$gtk3_theme" ]]; then
+            gtk2_theme+=" [GTK2], "
+            gtk3_theme+=" [GTK3] "
 
-        elif [[ "$gtk2theme" && "$gtk3theme" ]]; then
-            gtk2theme+=" [GTK2], "
-            gtk3theme+=" [GTK3] "
         else
-            [[ "$gtk2theme" ]] && gtk2theme+=" [GTK2] "
+            [[ "$gtk2_theme" ]] && gtk2_theme+=" [GTK2] "
-            [[ "$gtk3theme" ]] && gtk3theme+=" [GTK3] "
+            [[ "$gtk3_theme" ]] && gtk3_theme+=" [GTK3] "
         fi
 
         # Final string
-        theme="${gtk2theme}${gtk3theme}"
+        theme="${gtk2_theme}${gtk3_theme}"
 
         # Make the output shorter by removing "[GTKX]" from the string
         if [[ "$gtk_shorthand" == "on" ]]; then
-            theme="${theme/ '[GTK2]'}"
+            theme="${theme// '[GTK'[0-9]']'}"
-            theme="${theme/ '[GTK3]'}"
             theme="${theme/ '[GTK2/3]'}"
         fi
     fi
 }
 
 get_theme() {
-    get_style theme
+    name="gtk-theme-name"
+    gsettings="gtk-theme"
+    gconf="gtk_theme"
+    xfconf="/Net/ThemeName"
+    kde="widgetStyle"
+
+    get_style
 }
 
 get_icons() {
-    get_style icons
+    name="gtk-icon-theme-name"
+    gsettings="icon-theme"
+    gconf="icon_theme"
+    xfconf="/Net/IconThemeName"
+    kde="Theme"
+
+    get_style
     icons="$theme"
 }
 
 get_font() {
-    get_style font
+    name="gtk-font-name"
+    gsettings="font-name"
+    gconf="font_theme"
+    xfconf="/Gtk/FontName"
+    kde="font"
+
+    get_style
     font="$theme"
 }
 
@@ -1532,7 +1519,7 @@ get_term_font() {
         ;;
     esac
 
-    (("$bash_version" >= 4)) && term_font="${term_font^}"
+    term_font="$(uppercase "$term_font")"
 }
 
 get_disk() {
@@ -1999,7 +1986,7 @@ get_wallpaper() {
 
                 # Strip quotes etc from the path.
                 image="${image/'file://'}"
-                image="${image//\'}"
+                image="$(trim_quotes "$image")"
                 image="${image//\%20/ }"
             fi
         ;;
@@ -2427,6 +2414,16 @@ trim() {
     set +f
 }
 
+trim_quotes() {
+    trim_output="${1//\'}"
+    trim_output="${trim_output//\"}"
+    printf "%s" "$trim_output"
+}
+
+uppercase() {
+    (("$bash_version" >= 4)) && printf "%s" "${1^}"
+}
+
 # COLORS
 
 get_distro_colors() {