1
0

Wrap docker in subshell so output can be captured on failre

Signed-off-by: James Ketrenos <jketreno@media.ketrenos.com>
This commit is contained in:
James Ketrenos 2022-04-09 19:23:04 +00:00
parent 0bc4683296
commit 6c95fc0765

View File

@ -110,16 +110,14 @@ function convert {
OUT=$(realpath "${OUT}") OUT=$(realpath "${OUT}")
DIN=$(dirname "${IN}") DIN=$(dirname "${IN}")
DOUT=$(dirname "${OUT}") DOUT=$(dirname "${OUT}")
if true; then quiet="
quiet=" -v quiet
-v quiet -loglevel fatal
-loglevel fatal "
" # quiet=""
else
quiet=""
fi
docker run \ {
docker run \
--device=/dev/dri \ --device=/dev/dri \
--user=$(id -u) \ --user=$(id -u) \
--rm \ --rm \
@ -137,10 +135,12 @@ function convert {
${output_flags} \ ${output_flags} \
-movflags +faststart \ -movflags +faststart \
"${OUT}" \ "${OUT}" \
-y || fail "ffmpeg failed" 2>&1 | -y || echo "ffmpeg failed"
while read line; do } | while read line; do
if [[ "${line}" == "ffmpeg failed" ]]; then if [[ "${line}" == "ffmpeg failed" ]]; then
fail "FFMPEG failed"
false false
exit -1
break break
fi fi
POS=$(echo $line | sed -n 's/^frame=*\(.*\)/\1/p') POS=$(echo $line | sed -n 's/^frame=*\(.*\)/\1/p')