summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-10-27 12:54:11 +0100
committerHolger Levsen <holger@layer-acht.org>2014-10-27 12:54:11 +0100
commit07dd22ac0519552870b76432b2ed98743d63d86b (patch)
tree9d39e6d12e876633104d6a718f48639966eaba09 /bin
parent53e094da768f81aa1775cb5fdd1771f9ea9aceb5 (diff)
downloadjenkins.debian.net-07dd22ac0519552870b76432b2ed98743d63d86b.tar.xz
g-i-i: less + better output when running curl and ffmpeg2theora
Diffstat (limited to 'bin')
-rw-r--r--bin/g-i-installation.sh11
1 files changed, 7 insertions, 4 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 435823ab..0c352b27 100644
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -73,9 +73,11 @@ VIDEOBGCOLOR=gray10
fetch_if_newer() {
url="$2"
file="$1"
-
- curlopts="-L"
+ echo "Downloading $url"
+ curlopts="-L -s -S"
if [ -f "$file" ] ; then
+ Echo "$file exists, will only re-download if a newer one is available..."
+ ls $file
curlopts="$curlopts -z $file"
fi
curl $curlopts -o $file $url
@@ -118,8 +120,9 @@ cleanup_all() {
#
# create video
#
- ffmpeg2theora --videobitrate $VIDEOBITRATE --no-upscaling snapshot_%06d.ppm --framerate 12 --max_size $VIDEOSIZE -o g-i-installation-$NAME.ogv > /dev/null
- rm snapshot_??????.ppm
+ TMPFILE=$(mktemp)
+ ffmpeg2theora --videobitrate $VIDEOBITRATE --no-upscaling snapshot_%06d.ppm --framerate 12 --max_size $VIDEOSIZE -o g-i-installation-$NAME.ogv > $TMPFILE 2>&1 || cat $TMPFILE
+ rm snapshot_??????.ppm $TMPFILE
# rename .bak files back to .ppm
if find . -name "*.ppm.bak" > /dev/null ; then
for i in $(find * -name "*.ppm.bak") ; do