From: data <data@a0fa61bc-5347-0410-a1a9-7f54aa4e1825>
Date: Sun, 30 Jan 2005 23:19:22 +0000 (+0000)
Subject:  r33@keebo:  data | 2005-01-30T23:18:13.192535Z
X-Git-Url: https://git.hcoop.net/clinton/abcde.git/commitdiff_plain/09a85005c2b14d6449cc476792c4353cfb8b1641?hp=49c04b11b1b4c9e448b6728940b4d6dd7c34b4c9

 r33@keebo:  data | 2005-01-30T23:18:13.192535Z
 possible checking of cdparanoia -Q option


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

diff --git a/abcde b/abcde
index 4a28dda..04544cf 100755
--- a/abcde
+++ b/abcde
@@ -843,7 +843,12 @@ do_discid ()
 				cdparanoia|debug)
 					if [ "$WEHAVEACD" = "y" ]; then
 						vecho "Querying the CD for audio tracks..."
-						TRACKS=$( $CDROMREADER -d $CDROM -Q --verbose 2>&1 | egrep '^[[:space:]]+[[:digit:]]' | tail -n 1 |  awk '{print $1}' | tr -d "." | tr '\n' ' ' )
+						CDPARANOIAOUTPUT=$( $CDROMREADER -d $CDROM -Q --verbose 2>&1 )
+						RET=$?
+						if [ ! "$RET" = "0" ];then
+							echo "Warning: Something went wrong while querying the CD... Maybe a DATA CD?"
+						fi
+						TRACKS=$( echo $CDPARANOIAOUTPUT | egrep '^[[:space:]]+[[:digit:]]' | tail -n 1 |  awk '{print $1}' | tr -d "." | tr '\n' ' ' )
 						CDPARANOIAAUDIOTRACKS="$TRACKS"
 					else
 						if [ -f "$ABCDETEMPDIR/status" ] && checkstatus cdparanoia-audio-tracks ; then
@@ -858,6 +863,10 @@ do_discid ()
 		else
 			TRACKS=$(echo $TRACKINFO | cut -f2 -d' ')
 		fi
+		if echo "$TRACKS" | grep [[:digit:]] > /dev/null 2>&1 ;then :;else
+			echo "The disc does not contain any tracks. Giving up..."
+			exit 0
+		fi
 		echo -n "Grabbing entire CD - tracks: "
 		if [ ! "$PADTRACKS" = "y" ] ; then
 			TRACKNUMPADDING=$(echo -n $TRACKS | wc -c | tr -d ' ')