setup.sh: Abort on error.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index 81df8b190136d59898ce37cf203d36c54e93e86d..cf7eb54fe5cf5afe3ab45b405754f0202d000909 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -21,14 +21,17 @@
 
 set -e
 
-for path in `find . -name setup.sh -type f`; do
-    # Skip this directory to prevent an infinite loop.
-    [ "$path" = "./setup.sh" ] && continue
+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$||'`
 
     echo "running setup.sh in '$project'"
-    ( cd "$project"; ./setup.sh > /dev/null )
+    if ( cd "$project"; ./setup.sh >/dev/null ); then
+        :
+    else
+        echo "$project/setup.sh failed" >&2
+        exit 1
+    fi
 done