X-Git-Url: https://ruderich.org/simon/gitweb/?p=config%2Fdotfiles.git;a=blobdiff_plain;f=setup.sh;h=56a90928169eb5ebc4fdcbaedda4bc0ae2cfe882;hp=8873bf601137bcd78511472159609b6198fbe9f1;hb=9e4b2aff9242c3e72c714c3bf01c670b576e6627;hpb=ab9717d6cf1d9b0d1a5a3e2c932f39e8dd561a7f

diff --git a/setup.sh b/setup.sh
index 8873bf6..56a9092 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,8 +1,9 @@
 #!/bin/sh
 
-# Setup script for shell configuration files.
+# Runs setup.sh in all configuration directories. Must be run in the main
+# configuration directory.
 
-# Copyright (C) 2011-2012  Simon Ruderich
+# Copyright (C) 2009-2018  Simon Ruderich
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,87 +19,25 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-. ../lib.sh
+set -eu
 
-hostname=`hostname`
 
-# Create private temporary directory used by many tools (including GNU screen
-# and tmux).
-mkdir -p ~/.tmp
-chmod 0700 ~/.tmp
+# Enforce evtag checks for submodules.
+git submodule init > /dev/null
+for x in `git config --local --get-regexp 'submodule.*\.url' \
+        | awk '{print $1}'`; do
+    git config "${x%.url}.update" '!git-update-and-verify-submodule'
+done
 
-# Generate ~/.less with lesskey.
-lesskey lesskey
-chmod 0600 ~/.less
+for path in */setup.sh; do
+    # Skip non executable setup.sh files as an easy way to deactivate one.
+    test ! -x "$path" && continue
 
-# As screen-256color is not widely supported use it only on machines known to
-# work.
-generate cat screenrc .in
-if [ $hostname != asp -a $hostname != systemofadown ]; then
-    sed 's/Enable 256 color/Disable 256 color/;
-         s/screen-256color/screen/' screenrc > screenrc.tmp
-    mv screenrc.tmp screenrc
-fi
-# Some options are only necessary when running as root. They are marked as
-# "(ROOT)".
-if [ x`id -u` != x0 ]; 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
-    echo screenrc: removing Git features
-    grep -v '(GIT)' screenrc > screenrc.tmp
-    mv screenrc.tmp 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
-fi
-# Display current battery charge on computers with a battery. Necessary lines
-# are marked as "(BATTERY)".
-if [ ! -d /sys/class/power_supply/BAT0 ]; then
-    echo screenrc: removing battery display
-    grep -v '(BATTERY)' screenrc > screenrc.tmp
-    mv screenrc.tmp screenrc
-fi
+    project=`printf '%s' "$path" | sed 's|/setup.sh$||'`
 
-# Htop overwrites the comments in its configuration file.
-generate cat htoprc .in
-
-# Link setup for shells.
-link shell ~/.shell
-link bash ~/.bash
-link bash/rc ~/.bashrc
-link bash/profile ~/.bash_profile
-link bash/logout ~/.bash_logout
-if installed csh; then
-    link csh/rc ~/.cshrc
-fi
-link zsh ~/.zsh
-link zsh/env ~/.zshenv
-link zsh/rc ~/.zshrc
-link zsh/logout ~/.zlogout
-
-# Link setup for additional files.
-link lessfilter ~/.lessfilter
-if installed colordiff; then
-    link colordiffrc ~/.colordiffrc
-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
-    link htoprc ~/.htoprc
-fi
-
-# Create rlwrap history directory.
-mkdir -p shell/rlwrap
+    printf 'running setup.sh in "%s"\n' "$project"
+    ( cd "$project" && ./setup.sh >/dev/null ) || {
+        printf '%s/setup.sh failed\n' "$project" >&2
+        exit 1
+    }
+done