Fix CrunchBang detection, gsettings error output.

I'm not sure why the release file had its name changed in Waldorf, but screenFetch currently identifies #! as Debian as a result.

Single-bracket conditionals always evaluate to true without an argument, which is the case when `which` doesn't find anything. At present, this causes screenFetch to output a nasty `gsettings: command not found` message on #!. Using double brackets instead prevents this.
This commit is contained in:
Dorien Snake
2012-08-28 11:02:21 -03:00
parent 40c7c5abab
commit ca524b93fc

View File

@@ -362,7 +362,7 @@ detectdistro () {
if [ -f /etc/mageia-release ]; then distro="Mageia"; fi
if [ -f /etc/mandrake-release ]; then distro="Mandrake"; fi
if [ -f /etc/mandriva-release ]; then distro="Mandriva"; fi
if [ -f /etc/crunchbang-lsb-release ]; then distro="CrunchBang"; fi
if [ -f /etc/crunchbang-lsb-release ] || [ -f /etc/lsb-release-crunchbang ]; then distro="CrunchBang"; fi
if [ -f /etc/gentoo-release ]; then distro="Gentoo"; fi
if [ -f /var/run/dmesg.boot ] && grep -o "FreeBSD" /var/run/dmesg.boot; then distro="FreeBSD"; fi
if [ -f /var/run/dmesg.boot ] && grep -om 1 "DragonFly" /var/run/dmesg.boot; then distro="DragonFlyBSD"; fi
@@ -866,7 +866,7 @@ detectgtk () {
#if [ $(which gsettings) ] && [ "$distro" != "Mac OS X" ]; then
# gtk3Theme="$(gsettings get org.gnome.desktop.interface gtk-theme | tr -d \"\'\")"
#fi
if [ -x $(which gsettings) ]; then gtk3Theme=$(gsettings get org.gnome.desktop.interface gtk-theme | tr -d "'"); fi
if [[ -x $(which gsettings) ]]; then gtk3Theme=$(gsettings get org.gnome.desktop.interface gtk-theme | tr -d "'"); fi
# ROX-Filer icon detect only
if [ -a ${XDG_CONFIG_HOME:-${HOME}/.config}/rox.sourceforge.net/ROX-Filer/Options ]; then