X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/634e77be24c4a412bf1830b9c7965e6545d50fd6..f6398cd452506336f1255a5a37dd67377df1610e:/abcde

diff --git a/abcde b/abcde
index e3330d4..eb8fa64 100755
--- a/abcde
+++ b/abcde
@@ -926,18 +926,16 @@ do_encode ()
 		do
 			case "$TMPOUTPUT" in
 				vorbis|ogg)
-					OUT="$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER"
 					OUTPUT=$OGGOUTPUTCONTAINER
 					;;
 				flac)
-					OUT="$ABCDETEMPDIR/track$1.$FLACOUTPUTCONTAINER"
 					OUTPUT=$FLACOUTPUTCONTAINER
 					;;
 				*)
-					OUT="$ABCDETEMPDIR/track$1.$OUTPUT"
 					OUTPUT=$TMPOUTPUT
 					;;
 			esac
+			OUT="$ABCDETEMPDIR/track$1.$OUTPUT"
 			if [ "$NOGAP" = "y" ] && checkstatus encodetrack-$OUTPUT-$1 ; then 
 				continue
 			fi
@@ -1760,6 +1758,7 @@ do_localcddb ()
 						echo -n "#$X: "
 						do_cddbparse "${CDDBLOCALREAD}" 
 						echo ""
+						if [ ! "$INTERACTIVE" = "y" ]; then break ; fi
 					} >> "$ABCDETEMPDIR/cddblocalchoices"
 				done
 				if [ $(cat "$ABCDETEMPDIR/cddblocalchoices" | wc -l) -ge 24 ]; then
@@ -1789,8 +1788,9 @@ do_localcddb ()
 					done
 				else
 					### FIXME ###
-					echo "Selected ..."
+					#echo "Selected ..."
 					CDDBLOCALRESP=y
+					CDDBLOCALCHOICENUM=1
 				fi
 				if [ ! "$CDDBLOCALCHOICENUM" = "0" ]; then
 					#echo "Using local copy of CDDB data"
@@ -2737,7 +2737,7 @@ elif [ X$(uname) = "XNetBSD" ] ; then
 	HTTPGET=ftp
 	MD5SUM=md5
 	OSFLAVOUR=NBSD
-elif [ X$(uname) = "Solaris" ] ; then
+elif [ X$(uname) = "SunOS" ] ; then
 	HTTPGET=""
 	MD5SUM=md5
 	OSFLAVOUR=SunOS
@@ -3319,7 +3319,7 @@ if [ "$MAKECUEFILE" = "y" ]; then
 	NEEDCUEREADER=y
 fi
 
-if [ X"$CDSPEEDVALUE" != "X" ] && [ "$DOREAD" = "y"]; then
+if [ X"$CDSPEEDVALUE" != "X" ] && [ "$DOREAD" = "y" ]; then
 	case "$CDROMREADERSYNTAX" in
 		cdparanoia|debug) CDROMREADEROPTS="$CDPARANOIAOPTS -S $CDSPEEDVALUE" ;;
 		### FIXME ### translate "cue2discid" from python to bash