X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=bc3bd2221a5cba6c6431008074a0247af1d8e2f2;hb=4453828578cf549be4354479f826a2336c3697ad;hp=197263de0aca28cd92d749de5adb1d6599c19afc;hpb=ba1e10becaa8755981364ea61deee6cf48c38fb9;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index 197263d..bc3bd22 100755
--- a/setup.sh
+++ b/setup.sh
@@ -33,11 +33,11 @@ terminal_available() {
 # Usage: <file> <name> <grep-string> <value>
 apply_optional_replacement() {
     if test -n "$4"; then
-        echo "$1: using $2 $4"
+        printf '%s: using %s %s\n' "$1" "$2" "$4"
         generate "$1" '' simple_cpp \
             "$3" -- "$4"
     else
-        echo "$1: removing $2 display"
+        printf '%s: removing %s display\n' "$1" "$2"
         grep_i -v "$3" "$1"
     fi
 }
@@ -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.