From f9ba59d4f46d84f3bdd87554d8b551da20bc477f Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Tue, 22 Aug 2017 13:35:11 -0300 Subject: Do not exit while running in loop mode --- tools/build_snapshots.sh | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/tools/build_snapshots.sh b/tools/build_snapshots.sh index 70bf625..478289b 100755 --- a/tools/build_snapshots.sh +++ b/tools/build_snapshots.sh @@ -216,27 +216,33 @@ while [ /bin/true ]; do " if [ -n "${POUDRIERE_SNAPSHOTS}" ]; then exec_and_update_status \ - ${BUILDER_ROOT}/build.sh --update-poudriere-ports \ - || exit $? - - exec_and_update_status \ - ${BUILDER_ROOT}/build.sh ${NO_UPLOAD} --update-pkg-repo \ - || exit $? + ${BUILDER_ROOT}/build.sh --update-poudriere-ports + rc=$? + + if [ $rc -eq 0 ]; then + exec_and_update_status \ + ${BUILDER_ROOT}/build.sh ${NO_UPLOAD} \ + --update-pkg-repo + rc=$? + fi else exec_and_update_status \ - ${BUILDER_ROOT}/build.sh --clean-builder \ - || exit $? - - exec_and_update_status \ - ${BUILDER_ROOT}/build.sh ${NO_UPLOAD} --flash-size '2g 4g' \ - --snapshots ${NO_IMAGES} \ - || exit $? + ${BUILDER_ROOT}/build.sh --clean-builder + rc=$? + + if [ $rc -eq 0 ]; then + exec_and_update_status \ + ${BUILDER_ROOT}/build.sh ${NO_UPLOAD} --flash-size \ + '2g 4g' --snapshots \ + ${IMAGES} + rc=$? + fi fi IFS=${OIFS} if [ -z "${LOOPED_SNAPSHOTS}" ]; then # only one build required, exiting - exit + exit ${rc} fi # Count some sheep or wait until a new commit turns up -- cgit v1.1