From 50f2987126726d9a4d04e53d50025c5cda94a47b Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@derf.homelinux.org>
Date: Wed, 21 Apr 2010 23:26:01 +0200
Subject: fuze-vid: Remove scp logic, use scp $(fuze-vid ...) ...

---
 bin/fuze-vid | 35 ++++++-----------------------------
 1 file changed, 6 insertions(+), 29 deletions(-)

diff --git a/bin/fuze-vid b/bin/fuze-vid
index 2a29c68..889d5e6 100755
--- a/bin/fuze-vid
+++ b/bin/fuze-vid
@@ -7,48 +7,25 @@ set -e
 INPUT=${1}
 TMPOUT=/tmp/fuze/${INPUT:t:r}.tmp
 OUTPUT=/tmp/fuze/${INPUT:t:r}.avi
-DESTDIR=/data/derf/sansa-tmp/VIDEOS
 
 mkdir -p /tmp/fuze
 
-echo '--- encoding, stage 1/2'
+echo '--- encoding, stage 1/2' >&2
 mencoder -msglevel all=0:statusline=5 -ffourcc DX50 -ofps 20 -vf \
 pp=li,expand=:::::224/176,scale=224:176,harddup -ovc lavc -lavcopts \
 vcodec=mpeg4:vbitrate=683:vmax_b_frames=0:keyint=15:turbo:vpass=1 \
 -srate 44100 -af resample=44100:0:1,format=s16le -oac mp3lame \
--lameopts cbr:br=128 ${INPUT} -o ${TMPOUT}
+-lameopts cbr:br=128 ${INPUT} -o ${TMPOUT} >&2
 
 echo '--- encoding, stage 2/2'
 mencoder -msglevel all=0:statusline=5 -ffourcc DX50 -ofps 20 -vf \
 pp=li,expand=:::::224/176,scale=224:176,harddup -ovc lavc -lavcopts \
 vcodec=mpeg4:vbitrate=683:vmax_b_frames=0:keyint=15:vpass=2 -srate 44100 \
 -af resample=44100:0:1,format=s16le -oac mp3lame -lameopts cbr:br=128 \
-${INPUT} -o ${TMPOUT}
+${INPUT} -o ${TMPOUT} >&2
 
-echo '--- muxing'
-fuzemux ${TMPOUT} ${OUTPUT}
+echo '--- muxing' >&2
+fuzemux ${TMPOUT} ${OUTPUT} >&2
 rm ${TMPOUT}
 
-if [[ ${HOST} != aneurysm ]] && ping -c 1 derf.homelinux.org &> /dev/null; then
-	echo '--- copying to aneurysm'
-	scp ${OUTPUT} aneurysm:${DESTDIR}
-
-	# Encoding takes a long time. So it's better to be safe than sorry in
-	# this case
-
-	echo '--- verifying copy'
-	if [[ -n ${commands[sha512sum]} \
-		&& ${$(sha512sum ${OUTPUT})[1]} \
-		== ${$(ssh aneurysm "sha512sum ${DESTDIR}/${(q)OUTPUT:t}")[1]} ]] \
-	{
-		echo '--- OK, removing local file'
-		rm ${OUTPUT}
-	} else {
-		echo '--- failed'
-		echo
-		echo ${OUTPUT}
-	}
-else
-	echo
-	echo ${OUTPUT}
-fi
+echo ${OUTPUT}
-- 
cgit v1.2.3