Merge branch 'misc'

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index d982e56e58d7e0cddafd60b481573b4e5eca24a1..d2a3815772217ae7f9dda89e9c81082a99fe1d62 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -3,7 +3,7 @@
 # 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
@@ -19,14 +19,17 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-for path in `find . -name setup.sh -type f`; do
-    # Skip this directory to prevent an infinite loop.
-    [ "$path" = "./setup.sh" ] && continue
+set -eu
+
+for path in */setup.sh; do
     # Skip non executable setup.sh files as an easy way to deactivate one.
-    [ ! -x "$path" ] && continue
+    test ! -x "$path" && continue
 
-    project=`echo "$path" | sed 's|/setup.sh$||'`
+    project=`printf '%s' "$path" | sed 's|/setup.sh$||'`
 
-    echo "running setup.sh in '$project'"
-    ( cd "$project"; ./setup.sh > /dev/null )
+    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