summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2017-08-22 13:35:11 -0300
committerRenato Botelho <renato@netgate.com>2017-08-22 13:37:39 -0300
commit5339da65d643162bae55e9736dda31202704a6c2 (patch)
tree88a1d9cbb1bac9a528a1d51daf0d8e7427faa489
parent6d028dc26c129ce1b0b25551142819772664f1e5 (diff)
downloadpfsense-5339da65d643162bae55e9736dda31202704a6c2.zip
pfsense-5339da65d643162bae55e9736dda31202704a6c2.tar.gz
Do not exit while running in loop mode
-rwxr-xr-xtools/build_snapshots.sh33
1 files changed, 19 insertions, 14 deletions
diff --git a/tools/build_snapshots.sh b/tools/build_snapshots.sh
index 23b1b43..693fc50 100755
--- a/tools/build_snapshots.sh
+++ b/tools/build_snapshots.sh
@@ -184,27 +184,32 @@ 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} --snapshots \
- ${IMAGES} \
- || exit $?
+ ${BUILDER_ROOT}/build.sh --clean-builder
+ rc=$?
+
+ if [ $rc -eq 0 ]; then
+ exec_and_update_status \
+ ${BUILDER_ROOT}/build.sh ${NO_UPLOAD} --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
OpenPOWER on IntegriCloud