X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=39f706efe21fe016fbc3f5cfd5bbe5d92d60a424;hb=1434bb718d186e575f79cb9a9b04ebf4ca29aef2;hp=c2a56d574475118bd5a32b8545609ca3c45e9c38;hpb=6e2852c7dab40a901591a65224d1984a439d29e3;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index c2a56d5..39f706e 100755
--- a/setup.sh
+++ b/setup.sh
@@ -34,8 +34,6 @@ if ! infocmp > /dev/null 2>&1; then
 fi
 
 
-hostname=`hostname`
-
 # Create private temporary directory used by many tools (including GNU screen
 # and tmux).
 mkdir -p ~/.tmp
@@ -45,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
@@ -63,7 +101,7 @@ if terminal_available screen-256color; then
         # terminal_info check for manual installations which modify
         # rxvt-unicode's terminfo entry.
         urxvt_path=`which urxvt`
-        urxvt_grep=`strings "$urxvt_path" | grep '^TERM=rxvt-')`
+        urxvt_grep=`strings "$urxvt_path" | grep '^TERM=rxvt-'`
         if test x"$urxvt_grep" = 'xTERM=rxvt-unicode-256color' \
                 || terminal_info rxvt-unicode \
                     | grep -F 'colors#256' >/dev/null; then
@@ -83,14 +121,15 @@ if test -z "$use_256colors"; then
 fi
 # Some options are only necessary when running as root. They are marked as
 # "(ROOT)".
-if [ x`id -u` != x0 ]; then
+if test "`id -u`" -ne 0; then
     echo screenrc: removing root options
     grep -v '(ROOT)' screenrc > screenrc.tmp
     mv screenrc.tmp screenrc
 fi
-# I use some features of screen which are only in Git. Drop them on machines
-# which have older versions. They are marked as "(GIT)".
-if [ $hostname != asp -o x`id -u` = x0 ]; then
+# 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
     echo screenrc: removing Git features
     grep -v '(GIT)' screenrc > screenrc.tmp
     mv screenrc.tmp screenrc
@@ -104,12 +143,30 @@ if installed rxvt; then
 fi
 # Display current battery charge on computers with a battery. Necessary lines
 # are marked as "(BATTERY)".
-if [ ! -d /sys/class/power_supply/BAT0 ]; then
+if test ! -d /sys/class/power_supply/BAT0; then
     echo screenrc: removing battery display
     grep -v '(BATTERY)' screenrc > screenrc.tmp
     mv screenrc.tmp screenrc
 fi
 
+if installed tmux; then
+    generate perl tmux.conf ./bin/remove-continuation.pl
+
+    # 256 colors not available.
+    if test -z "$use_256colors"; then
+        echo tmux.conf: removing 256 colors
+        sed 's/Enable 256 color/Disable 256 color/;
+             s/screen-256color/screen/' tmux.conf > tmux.conf.tmp
+        mv tmux.conf.tmp tmux.conf
+    fi
+    # Tmux doesn't display a warning if the shell wasn't found!
+    if test ! -x '/bin/zsh'; then
+        echo tmux.conf: removing /bin/zsh as shell
+        sed 's/zsh/sh/' tmux.conf > tmux.conf.tmp
+        mv tmux.conf.tmp tmux.conf
+    fi
+fi
+
 # Htop overwrites the comments in its configuration file.
 generate cat htoprc .in
 
@@ -135,7 +192,6 @@ fi
 link inputrc ~/.inputrc
 link screenrc ~/.screenrc
 if installed tmux; then
-    generate perl tmux.conf ./bin/remove-continuation.pl
     link tmux.conf ~/.tmux.conf
 fi
 if installed htop; then