X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=44074f0a0767732289e8e808e5cb1a53e2d075d1;hb=25a08d633cffde3db73220f8de8cdc1ff6188ff1;hp=cc77d54e5a6c7b6a450ad69e7f030e907e4c2475;hpb=0b60017e21b2b4d2253d1b3dc2d97341db0555e4;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index cc77d54..44074f0 100755
--- a/setup.sh
+++ b/setup.sh
@@ -43,6 +43,46 @@ chmod 0700 ~/.tmp
 lesskey lesskey
 chmod 0600 ~/.less
 
+# Find the required options to get colored ls output. GNU ls is preferred. See
+# shell/aliases.in for details. Doing this here instead of in shell/aliases
+# speeds up shell starts.
+#
+# Check if colors are available.
+ls --color > /dev/null 2>&1
+if test $? -eq 0; then
+    ls_color=gnu
+else
+    ls -G > /dev/null 2>&1
+    if test $? -eq 0; then
+        ls_color=cli
+    else
+        ls_color=
+    fi
+fi
+# Absolute path to `ls`.
+ls_path=`which ls`
+# GNU ls with colors.
+if test "x$ls_color" = xgnu; then
+    ls_env=
+    ls_color='--color'
+# Normal (BSD) ls with colors.
+elif test "x$ls_color" = xcli; then
+    ls_env='CLICOLOR_FORCE=1'
+    ls_color='-G'
+# Simple ls with no colors.
+else
+    ls_env=
+    ls_color=
+fi
+generate perl shell/aliases \
+    -e 'while (<STDIN>) {
+            s/\bLS_ENV\b/$ARGV[0]/;
+            s/\bLS_PATH\b/$ARGV[1]/;
+            s/\bLS_COLOR\b/$ARGV[2]/;
+            print;
+        }' \
+    "$ls_env" "$ls_path" "$ls_color"
+
 generate cat screenrc .in
 # As screen-256color is not widely supported use it only on machines where the
 # matching terminfo entry is available. This also requires a terminal emulator
@@ -89,7 +129,7 @@ fi
 # I use some features of GNU screen which are only in Git or very recent GNU
 # screen versions. Drop them on machines which have older versions. They are
 # marked as "(GIT)".
-if test -d "$HOME/development/shell/screen"; then
+if test ! -d "$HOME/development/shell/screen"; then
     echo screenrc: removing Git features
     grep -v '(GIT)' screenrc > screenrc.tmp
     mv screenrc.tmp screenrc