X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=d2a3815772217ae7f9dda89e9c81082a99fe1d62;hb=952d3607eba14b0f3e2af9b05c7bf5a3dad0acf0;hp=df9b80e4c31fbbccbe297aa5cd47629f6b170fb0;hpb=19d6b23933ad68c37e0098f93da4afdbe153e532;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index df9b80e..d2a3815 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,8 +1,9 @@
 #!/bin/sh
 
-# Setup script for X11 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,66 +19,17 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-set -e
+set -eu
 
-. ../lib.sh
+for path in */setup.sh; do
+    # Skip non executable setup.sh files as an easy way to deactivate one.
+    test ! -x "$path" && continue
 
+    project=`printf '%s' "$path" | sed 's|/setup.sh$||'`
 
-if installed stumpwm; then
-    link stumpwmrc ~/.stumpwmrc
-fi
-if installed xmonad; then
-    link xmonad ~/.xmonad
-fi
-
-if installed X; then
-    # Prevent code duplication. Term* rules are for all terminals; XTerm rules
-    # are for XTerm and UXTerm. At the moment XTerm, UXTerm and Rxvt are
-    # supported.
-    generate Xdefaults .in perl -ne \
-        'if (/^Term/) {
-             s/^Term//;
-             print "XTerm", $_;
-             print "UXTerm", $_;
-             print "Rxvt", $_;
-         } elsif (/^XTerm/) {
-             print $_;
-             s/^XTerm//;
-             print "UXTerm", $_;
-         } else {
-             print $_;
-         }'
-    # Xdefaults uses ! as comment instead of #.
-    sed_i 's/^#/!/' Xdefaults
-
-    if test ! "x`os`" = xdarwin; then
-        link xinitrc ~/.xinitrc
-        # lightdm doesn't use ~/.xinitrc but ~/.xprofile instead. Assume it's
-        # used when the lightdm configuration file is present.
-        if test -f "$HOME/.dmrc"; then
-            link xinitrc ~/.xprofile
-        fi
-    fi
-    if test -f xinitrc.local; then
-        link xinitrc.local ~/.xinitrc.local
-    fi
-    link xmodmaprc ~/.xmodmaprc
-    link Xdefaults ~/.Xdefaults
-    link XCompose ~/.XCompose
-fi
-
-if installed xpdf; then
-    link xpdfrc ~/.xpdfrc
-fi
-if installed zathura; then
-    mkdir -p ~/.config/zathura
-    link zathurarc ~/.config/zathura/zathurarc
-fi
-
-if installed feh; then
-    mkdir -p ~/.config
-    link feh ~/.config/feh
-    # Older feh versions only support theme options and configure them through
-    # ~/.fehrc.
-    link feh/themes ~/.fehrc
-fi
+    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