X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=d2a3815772217ae7f9dda89e9c81082a99fe1d62;hb=d6be090fbd967587eb2af1496a237c1d8114f470;hp=cf7eb54fe5cf5afe3ab45b405754f0202d000909;hpb=d833e9f69422ab8702f877886bc30324a7787d3a;p=config%2Fdotfiles.git diff --git a/setup.sh b/setup.sh index cf7eb54..d2a3815 100755 --- 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,19 +19,17 @@ # along with this program. If not, see . -set -e +set -eu for path in */setup.sh; do # Skip non executable setup.sh files as an easy way to deactivate one. 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'" - if ( cd "$project"; ./setup.sh >/dev/null ); then - : - else - echo "$project/setup.sh failed" >&2 + printf 'running setup.sh in "%s"\n' "$project" + ( cd "$project" && ./setup.sh >/dev/null ) || { + printf '%s/setup.sh failed\n' "$project" >&2 exit 1 - fi + } done