diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-11-09 15:49:44 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-11-14 20:10:39 +0000 |
| commit | bcc6d4c633ee8aebdca29f8cd4413e8931fa3f48 (patch) | |
| tree | 794ed268dcd34187c3b6199d997dccf4e6180508 | |
| parent | d85035c73d68caf2ef06038e2830c2f3644bf650 (diff) | |
| download | aports-bcc6d4c633ee8aebdca29f8cd4413e8931fa3f48.tar.bz2 aports-bcc6d4c633ee8aebdca29f8cd4413e8931fa3f48.tar.xz | |
scripts/mkimage.sh: exit early on error
| -rw-r--r-- | scripts/mkimage.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/mkimage.sh b/scripts/mkimage.sh index 2490a87f43..b72b203338 100644 --- a/scripts/mkimage.sh +++ b/scripts/mkimage.sh @@ -113,6 +113,7 @@ build_section() { else rm -rf "$DESTDIR" _fail="yes" + return 1 fi fi fi @@ -134,7 +135,7 @@ build_profile() { # Collect list of needed sections, and make sure they are built for SECTION in $all_sections; do - section_$SECTION + section_$SECTION || return 1 done [ "$_fail" = "no" ] || return 1 @@ -163,7 +164,7 @@ build_profile() { if [ "$_dirty" = "yes" -o ! -e "$output_filename" ]; then # Create image output_format="${image_ext//[:\.]/}" - create_image_${output_format} || _fail="yes" + create_image_${output_format} || { _fail="yes"; false; } if [ "$_checksum" = "yes" ]; then for _c in $all_checksums; do @@ -221,6 +222,6 @@ for ARCH in $req_arch; do abuild-apk update --root "$APKROOT" for PROFILE in $req_profiles; do - (build_profile) + (build_profile) || exit 1 done done |