Really fix whitespace issue

This commit is contained in:
Dylan 2016-01-24 10:38:46 +11:00
parent d480966172
commit f1e1915a08
1 changed files with 9 additions and 7 deletions

16
fetch
View File

@ -885,12 +885,6 @@ getgtk () {
gtk2theme=$(grep "^[^#]*$name" /etc/gtk-2.0/gtkrc) gtk2theme=$(grep "^[^#]*$name" /etc/gtk-2.0/gtkrc)
fi fi
# Format the string
gtk2theme=${gtk2theme/${name}*=/}
gtk2theme=${gtk2theme//\"/}
gtk2theme="$gtk2theme"
[ "$gtk2theme" ] && gtktheme="$gtk2theme [GTK2] "
# Check for gtk3 theme # Check for gtk3 theme
if [ -f "$HOME/.config/gtk-3.0/settings.ini" ]; then if [ -f "$HOME/.config/gtk-3.0/settings.ini" ]; then
gtk3theme=$(grep "^[^#]*$name" $HOME/.config/gtk-3.0/settings.ini) gtk3theme=$(grep "^[^#]*$name" $HOME/.config/gtk-3.0/settings.ini)
@ -898,10 +892,18 @@ getgtk () {
gtk3theme=$(grep "^[^#]*$name" /etc/gtk-3.0/settings.ini) gtk3theme=$(grep "^[^#]*$name" /etc/gtk-3.0/settings.ini)
fi fi
# Format the strings
gtk2theme=${gtk2theme/${name}*=/}
gtk2theme=${gtk2theme//\"/}
gtk2theme=${gtk2theme//[[:space:]]/ }
[ "$gtk2theme" ] && \
gtktheme="$gtk2theme [GTK2] "
# Format the string # Format the string
gtk3theme=${gtk3theme/${name}*=/} gtk3theme=${gtk3theme/${name}*=/}
gtk3theme=${gtk3theme//\"/} gtk3theme=${gtk3theme//\"/}
gtk3theme="$gtk3theme" gtk3theme=${gtk3theme//[[:space:]]/ }
gtktheme="${gtk2theme}${gtk3theme} [GTK3]" gtktheme="${gtk2theme}${gtk3theme} [GTK3]"
# Check to see if gtk2 and gtk3 theme are identical # Check to see if gtk2 and gtk3 theme are identical