From 07dd22ac0519552870b76432b2ed98743d63d86b Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Mon, 27 Oct 2014 12:54:11 +0100
Subject: g-i-i: less + better output when running curl and ffmpeg2theora

---
 bin/g-i-installation.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'bin')

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
-- 
cgit v1.2.3-70-g09d2