diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2017-04-04 13:12:48 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-04-04 13:12:48 +0000 |
commit | ecc1f509c6d469223cfbf4ef3f7c574de286ba6e (patch) | |
tree | 41b8ea045ac1d67a8ebedd5d68aa1ff5fc1d04dc /abuild.in | |
parent | 1ddc910eb328b4534234bd2f97e631a075241abd (diff) | |
download | abuild-ecc1f509c6d469223cfbf4ef3f7c574de286ba6e.tar.bz2 abuild-ecc1f509c6d469223cfbf4ef3f7c574de286ba6e.tar.xz |
abuild: set -e fix for update_config_{sub,guess}
Diffstat (limited to 'abuild.in')
-rw-r--r-- | abuild.in | 16 |
1 files changed, 4 insertions, 12 deletions
@@ -532,8 +532,7 @@ mkusers() { # helper to update config.sub to a recent version update_config_sub() { - local changed=false - find . -name config.sub | while read f; do + find . -name config.sub | (local changed=false; while read f; do if ! ./$f armv6-alpine-linux-muslgnueabihf 2>/dev/null; then msg "Updating $f" cp "$datadir"/${f##*/} "$f" || return 1 @@ -541,16 +540,12 @@ update_config_sub() { else msg "No update needed for $f" fi - # pipe subshell will return status of last command - $changed - done - return $? + done; $changed) } # helper to update config.guess to a recent version update_config_guess() { - local changed=false - find . -name config.guess | while read f; do + find . -name config.guess | (local changed=false; while read f; do if grep -q aarch64 "$f" && grep -q ppc64le "$f"; then msg "No update needed for $f" else @@ -558,10 +553,7 @@ update_config_guess() { cp "$datadir"/${f##*/} "$f" || return 1 changed=true fi - # pipe subshell will return status of last command - $changed - done - return $? + done; $changed) } runpart() { |