From: data <data@a0fa61bc-5347-0410-a1a9-7f54aa4e1825>
Date: Fri, 4 Nov 2005 14:51:18 +0000 (+0000)
Subject: Added some OUTPUT changes in do_encode to match the output of do_move and solve BTS... 
X-Git-Url: https://git.hcoop.net/clinton/abcde.git/commitdiff_plain/a9b99f530791c0d08afa0eeb3fba108a344dc24d

Added some OUTPUT changes in do_encode to match the output of do_move and solve BTS#337383

git-svn-id: http://abcde.googlecode.com/svn/trunk@155 a0fa61bc-5347-0410-a1a9-7f54aa4e1825
---

diff --git a/abcde b/abcde
index c90c2e3..b4cd993 100755
--- a/abcde
+++ b/abcde
@@ -840,20 +840,22 @@ do_encode ()
 	if [ -s "$IN" -o X"$USEPIPES" = "Xy" ] ; then
 		for OUTPUT in $(echo $OUTPUTTYPE | tr , \ )
 		do
-			if [ "$NOGAP" = "y" ] && checkstatus encodetrack-$OUTPUT-$1 ; then 
-				continue
-			fi
 			case "$OUTPUT" in
 				vorbis|ogg)
 					OUT="$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER"
+					OUTPUT=$OGGOUTPUTCONTAINER
 					;;
 				flac)
 					OUT="$ABCDETEMPDIR/track$1.$FLACOUTPUTCONTAINER"
+					OUTPUT=$FLACOUTPUTCONTAINER
 					;;
 				*)
 					OUT="$ABCDETEMPDIR/track$1.$OUTPUT"
 					;;
 			esac
+			if [ "$NOGAP" = "y" ] && checkstatus encodetrack-$OUTPUT-$1 ; then 
+				continue
+			fi
 			if [ X"$USEPIPES" = "Xy" ]; then
 				RUN_COMMAND=""
 				# We need a way to store the creation of the files when using PIPES