diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2018-05-22 21:58:40 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2018-05-22 21:58:40 +0200 |
commit | 3709f3670144edb5b61429ecacdcb71eb520dda1 (patch) | |
tree | 4e2c9b1006a5368e0dc687da2c537074fdbe7542 /odin/strm | |
parent | 442a0f4db8f56bcc6e4bfa93b92e2361ed195175 (diff) | |
download | nixos-3709f3670144edb5b61429ecacdcb71eb520dda1.tar nixos-3709f3670144edb5b61429ecacdcb71eb520dda1.tar.gz nixos-3709f3670144edb5b61429ecacdcb71eb520dda1.tar.bz2 nixos-3709f3670144edb5b61429ecacdcb71eb520dda1.tar.xz nixos-3709f3670144edb5b61429ecacdcb71eb520dda1.zip |
...
Diffstat (limited to 'odin/strm')
-rw-r--r-- | odin/strm/download_youtube | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/odin/strm/download_youtube b/odin/strm/download_youtube index 043d98f4..d2aa069d 100644 --- a/odin/strm/download_youtube +++ b/odin/strm/download_youtube | |||
@@ -289,11 +289,10 @@ printf ">>> %s <<<\n %s\n" "${msgId}" "${message}" | |||
289 | p1args+=(-an -f matroska) | 289 | p1args+=(-an -f matroska) |
290 | print -- ${prePass} ${p1args} | 290 | print -- ${prePass} ${p1args} |
291 | ffmpeg ${args} ${prePass} ${p1args} -- /dev/null | 291 | ffmpeg ${args} ${prePass} ${p1args} -- /dev/null |
292 | ffmpegResult=$((ffmpegResult || $?)) | ||
293 | 292 | ||
294 | print -- ${cargs} ${p2args} | 293 | print -- ${cargs} ${p2args} |
295 | ffmpeg ${args} ${cargs} ${p2args} -- "${filename}" | 294 | ffmpeg ${args} ${cargs} ${p2args} -- "${filename}" |
296 | ffmpegResult=$((ffmpegResult || $?)) | 295 | ffmpegResult=$? |
297 | 296 | ||
298 | cd ${oldPwd} | 297 | cd ${oldPwd} |
299 | else | 298 | else |
@@ -301,7 +300,7 @@ printf ">>> %s <<<\n %s\n" "${msgId}" "${message}" | |||
301 | 300 | ||
302 | print -- ${cargs} ${p2args} | 301 | print -- ${cargs} ${p2args} |
303 | pv -N "$(trimName "trans:" ${title})" ${tempfile} | ffmpeg ${args} ${cargs} ${p2args} -- "${filename}" | 302 | pv -N "$(trimName "trans:" ${title})" ${tempfile} | ffmpeg ${args} ${cargs} ${p2args} -- "${filename}" |
304 | ffmpegResult=$((ffmpegResult || ${pipestatus[2]})) | 303 | ffmpegResult=${pipestatus[2]} |
305 | fi | 304 | fi |
306 | fi | 305 | fi |
307 | fi | 306 | fi |