X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=370bf5c0f7006a708ddf7fe1dce564b2d0fd54cd;hb=d30e0e8afa67eeb9f7163c71bbd6bc568ad5e1b6;hp=55efa84bb13cadfae3cbef9ea446eff703f5c3b2;hpb=9d8a67ce233b2f76256fe3f1127232ad540ff865;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index 55efa84..370bf5c 100755
--- a/setup.sh
+++ b/setup.sh
@@ -18,8 +18,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+set -e
+
 . ../lib.sh
 
+
 # Helper functions.
 terminal_info() {
     infocmp "$@" 2>&1
@@ -27,22 +30,110 @@ terminal_info() {
 terminal_available() {
     terminal_info "$@" > /dev/null
 }
+grep_i() {
+    cmd_i grep "$@"
+}
 # Check if `infocmp` is available.
-if ! infocmp > /dev/null 2>&1; then
+if ! infocmp >/dev/null 2>&1; then
     echo 'Warning: `infocmp` not available! 256color checks will fail.'
     echo
 fi
 
 
+# DIRECTORY SETUP
+
 # Create private temporary directory used by many tools (including GNU screen
 # and tmux).
 mkdir -p ~/.tmp
 chmod 0700 ~/.tmp
 
-# Generate ~/.less with lesskey.
-lesskey lesskey
+# Create rlwrap history directory.
+mkdir -p shell/rlwrap
+# Create zsh cache directory.
+mkdir -p zsh/cache
+
+
+# FILE SETUP
+
+# Generate ~/.less with lesskey. Prevent cluttering ~/ by storing the history
+# file in this directory; this requires replacing the constant HISTORY_PATH in
+# lesskey.
+echo lesskey: generating .lesskey
+perl < lesskey \
+    -e 'while (<STDIN>) {
+            s/\bHISTORY_PATH\b/$ARGV[0]/;
+            print;
+        }' \
+    "`pwd`/lesshistory" \
+    | lesskey -
 chmod 0600 ~/.less
 
+# Custom colors for GNU ls.
+if installed dircolors; then
+    echo '# WARNING! DO NOT EDIT THIS FILE!' >shell/dircolors
+    dircolors -b shell/dircolors.in >>shell/dircolors
+fi
+
+# 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.
+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
+    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
+
+# Also check if `column -t` is available.
+if echo test | column -t >/dev/null 2>&1; then
+    column=' | column -t'
+else
+    column=
+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]/;
+            s/\bCOLUMN\b/$ARGV[3]/;
+            print;
+        }' \
+    "$ls_env" "$ls_path" "$ls_color" "$column"
+
+# If `tig` is not available use my simple replacement.
+if ! installed tig; then
+    echo "alias tig='git tig'" >>shell/aliases
+fi
+
+# Check if grep supports --color=auto.
+if echo test | grep --color=auto test >/dev/null 2>&1; then
+    :
+else
+    echo 'shell/aliases: removing grep --color=auto'
+    sed_i '/^alias grep=/ s/^/#/' shell/aliases
+fi
+
 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
@@ -60,8 +151,8 @@ if terminal_available screen-256color; then
         # rxvt-unicode binaries (e.g. Debian's rxvt-unicode-256color), the
         # 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_path=`installed_path urxvt`
+        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
@@ -75,61 +166,70 @@ if terminal_available screen-256color; then
 fi
 if test -z "$use_256colors"; then
     echo screenrc: removing 256 colors
-    sed 's/Enable 256 color/Disable 256 color/;
-         s/screen-256color/screen/' screenrc > screenrc.tmp
-    mv screenrc.tmp screenrc
+    sed_i 's/Enable 256 color/Disable 256 color/;
+           s/screen-256color/screen/' screenrc
 fi
 # Some options are only necessary when running as root. They are marked as
 # "(ROOT)".
 if test "`id -u`" -ne 0; then
     echo screenrc: removing root options
-    grep -v '(ROOT)' screenrc > screenrc.tmp
-    mv screenrc.tmp screenrc
+    grep_i -v '(ROOT)' screenrc
 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
     echo screenrc: removing Git features
-    grep -v '(GIT)' screenrc > screenrc.tmp
-    mv screenrc.tmp screenrc
+    grep_i -v '(GIT)' screenrc
 fi
 # Rxvt doesn't need the attrcolor "fix". As I prefer rxvt assume I use it when
 # it's installed.
 if installed rxvt; then
     echo screenrc: removing attrcolor \"fix\"
-    sed 's/attrcolor b ".I"/#attrcolor b ".I"/' screenrc > screenrc.tmp
-    mv screenrc.tmp screenrc
+    sed_i 's/attrcolor b ".I"/#attrcolor b ".I"/' screenrc
 fi
 # Display current battery charge on computers with a battery. Necessary lines
 # are marked as "(BATTERY)".
 if test ! -d /sys/class/power_supply/BAT0; then
     echo screenrc: removing battery display
-    grep -v '(BATTERY)' screenrc > screenrc.tmp
-    mv screenrc.tmp screenrc
+    grep_i -v '(BATTERY)' screenrc
 fi
 
 if installed tmux; then
     generate perl tmux.conf ./bin/remove-continuation.pl
 
+    # Add mappings to switch to windows 10-29 quickly. See tmux-window.pl for
+    # details.
+    perl ./tmux-window.pl 1 "`pwd`/tmux-window2.conf" >tmux-window1.conf
+    perl ./tmux-window.pl 2                           >tmux-window2.conf
+    # Set absolute path to tmux-window1.conf in tmux.conf.
+    perl <tmux.conf >tmux.conf.tmp \
+        -e 'while (<STDIN>) {
+                s/\bTMUX_WINDOW_PATH\b/$ARGV[0]/;
+                print;
+            }' \
+        "`pwd`/tmux-window1.conf"
+    mv tmux.conf.tmp tmux.conf
+
     # 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
+        sed_i 's/Enable 256 color/Disable 256 color/;
+               s/screen-256color/screen/' 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
+        sed_i 's/zsh/sh/' tmux.conf
     fi
 fi
 
 # Htop overwrites the comments in its configuration file.
 generate cat htoprc .in
 
+
+# LINK SETUP
+
 # Link setup for shells.
 link shell ~/.shell
 link bash ~/.bash
@@ -145,6 +245,9 @@ link zsh/rc ~/.zshrc
 link zsh/logout ~/.zlogout
 
 # Link setup for additional files.
+if installed crontab; then
+    link crontab.d ~/.crontab.d
+fi
 link lessfilter ~/.lessfilter
 if installed colordiff; then
     link colordiffrc ~/.colordiffrc
@@ -156,7 +259,10 @@ if installed tmux; then
 fi
 if installed htop; then
     link htoprc ~/.htoprc
+    # New location for htoprc. Use both for compatibility.
+    mkdir -p ~/.config/htop
+    link htoprc ~/.config/htop/htoprc
+fi
+if test -d ~/.ssh && test -O ~/.ssh; then
+    link ssh_config ~/.ssh/config
 fi
-
-# Create rlwrap history directory.
-mkdir -p shell/rlwrap