setup.sh: Simplify ls color detection.

diff --git a/setup.sh b/setup.sh
index 96b18054c8232723ecb362f8929424ae51074a43..bc3bd2221a5cba6c6431008074a0247af1d8e2f2 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -82,24 +82,14 @@ fi
 # shell/aliases.in for details. Doing this here instead of in shell/aliases
 # speeds up shell starts.
 #
-# Check if colors are available.
-if ls --color >/dev/null 2>&1; then
-    ls_color=gnu
-else
-    if ls -G >/dev/null 2>&1; then
-        ls_color=cli
-    else
-        ls_color=
-    fi
-fi
 # Absolute path to `ls`.
 ls_path=`installed_path ls`
-# GNU ls with colors.
-if test "x$ls_color" = xgnu; then
+# GNU ls with colors available.
+if ls --color >/dev/null 2>&1; then
     ls_env=
     ls_color='--color'
-# Normal (BSD) ls with colors.
-elif test "x$ls_color" = xcli; then
+# Normal (BSD) ls with colors available.
+elif ls -G >/dev/null 2>&1; then
     ls_env='CLICOLOR_FORCE=1'
     ls_color='-G'
 # Simple ls with no colors.