X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=d2a3815772217ae7f9dda89e9c81082a99fe1d62;hb=c0ae7152026890b30acaa87498e3950b2ad1164e;hp=4055a84f6fe0d3c3ff11c680d1db1a5aed0b7d40;hpb=fc43808fc0aa0478b42d66757d6eff637c7116f6;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index 4055a84..d2a3815 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,8 +1,9 @@
 #!/bin/sh
 
-# Setup script for OS related configuration files.
+# Runs setup.sh in all configuration directories. Must be run in the main
+# configuration directory.
 
-# Copyright (C) 2009-2013  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,24 +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 test x"`os`" = xdarwin; then
-    # Sets a custom PATH for GUI applications.
-    mkdir -p ~/.MacOSX
-    link darwin/environment.plist ~/.MacOSX/environment.plist
-fi
-if test x"`os`" = xdebian; then
-    # Necessary as aptitude rewrites the config file on every start.
-    generate debian/aptitude/config .in cat
-    # aptitude/config uses // as comment instead of #.
-    sed -i 's|^#|//|' debian/aptitude/config
-
-    link debian/aptitude ~/.aptitude
-    if installed reportbug; then
-        link debian/reportbugrc ~/.reportbugrc
-    fi
-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