Fix build script failure if Xcode check finishes before install starts.

This commit is contained in:
Kyle Neideck 2016-04-29 07:41:06 +10:00
parent ccb709fc02
commit 3f62b012c3

View file

@ -255,17 +255,20 @@ check_xcode() {
# Expects CHECK_XCODE_TASK_PID to be set. # Expects CHECK_XCODE_TASK_PID to be set.
handle_check_xcode_result() { handle_check_xcode_result() {
# Wait for the Xcode checks to finish. if [[ -z ${HANDLED_CHECK_XCODE_RESULT:-} ]]; then
set +e HANDLED_CHECK_XCODE_RESULT=1
trap - ERR # Wait for the Xcode checks to finish.
wait ${CHECK_XCODE_TASK_PID} set +e
CHECK_XCODE_TASK_STATUS=$? trap - ERR
trap 'error_handler ${LINENO}' ERR wait ${CHECK_XCODE_TASK_PID}
set -e CHECK_XCODE_TASK_STATUS=$?
trap 'error_handler ${LINENO}' ERR
set -e
# If there was a problem with Xcode/xcodebuild, print the error message and exit. # If there was a problem with Xcode/xcodebuild, print the error message and exit.
if [[ ${CHECK_XCODE_TASK_STATUS} -ne 0 ]]; then if [[ ${CHECK_XCODE_TASK_STATUS} -ne 0 ]]; then
handle_check_xcode_failure ${CHECK_XCODE_TASK_STATUS} handle_check_xcode_failure ${CHECK_XCODE_TASK_STATUS}
fi
fi fi
} }