fix(deploy): preserve rc under set -e (run_quiet swallowed errors silently)
'wait $pid' triggered 'set -e' before 'local rc=$?' could capture exit code, so xcodebuild failures vanished without any log dump. Use 'wait $pid && rc=0 || rc=$?' idiom to keep the script alive and let the error-dump branch run.
This commit is contained in:
parent
061bd2d799
commit
9f8e99d287
@ -174,7 +174,7 @@ run_quiet() {
|
|||||||
return ${PIPESTATUS[0]}
|
return ${PIPESTATUS[0]}
|
||||||
fi
|
fi
|
||||||
local start=$SECONDS
|
local start=$SECONDS
|
||||||
local expected pid elapsed subtitle
|
local expected pid elapsed subtitle rc
|
||||||
expected=$(runtime_lookup "$label" || echo 0)
|
expected=$(runtime_lookup "$label" || echo 0)
|
||||||
expected=${expected:-0}
|
expected=${expected:-0}
|
||||||
RUN_QUIET_I=0
|
RUN_QUIET_I=0
|
||||||
@ -203,8 +203,7 @@ run_quiet() {
|
|||||||
render_progress "$elapsed" "$expected" "$label" "$subtitle"
|
render_progress "$elapsed" "$expected" "$label" "$subtitle"
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
done
|
done
|
||||||
wait "$pid"
|
wait "$pid" && rc=0 || rc=$?
|
||||||
local rc=$?
|
|
||||||
elapsed=$((SECONDS - start))
|
elapsed=$((SECONDS - start))
|
||||||
# Clear progress line
|
# Clear progress line
|
||||||
printf '\r\033[K' >&2
|
printf '\r\033[K' >&2
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user