[abcde] Bug#110417: Addition cleanup patch110417@bugs.debian.org

[Dominic Hargreaves <dominic.hargreaves@magdalen.oxford.ac.uk>]

My previous patch was incomplete, as it left unused variables lying 
around. Here is an additional patch, apply after the original.

--- abcde.old	Tue Aug 28 17:31:19 2001
+++ abcde	Tue Aug 28 17:37:20 2001
@@ -208,8 +208,8 @@
 # do_tag [tracknumber]
 # id3 tags a filename
 # variables used:
-# TRACKS, TRACKNAME, TRACKARTIST, TAGGER, TAGGEROPTS, COMMENT, DALBUM, DARTIST
-# (and temporarily) ID3TAGV
+# TRACKS, TRACKNAME, TRACKARTIST, ID3V, ID3V2, ID3OPTS, ID3V2OPTS, ID3COMMENT,
+# DALBUM, DARTIST (and temporarily) ID3TAGV
 do_tag ()
 {
 	COMMENTOUTPUT="$(eval echo ${COMMENT})"
@@ -1042,16 +1042,6 @@
 		;;
 esac
 
-# and which tagger
-
-if [ "$ID3TAGV" = "1" ]; then
-	TAGGER="$ID3"
-	TAGGEROPTS="$ID3OPTS"
-else
-	TAGGER="$ID3V2"
-	TAGGEROPTS="$ID3V2OPTS"
-fi
-
 # Clean up nice options (either use '-n NICELEVEL or -NICELEVEL')
 
 if [ "$ENCNICE" ]; then
@@ -1068,8 +1058,8 @@
 if [ "$OUTPUTTYPE" = "ogg" ]; then NEEDCOMMENTER=y; fi
 
 # Make sure a buncha things exist
-for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $ENCODER $WGET \
-	${NEEDDISTMP3+$DISTMP3} ${NEEDCOMMENTER+$VORBISCOMMENT}
+for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$ID3} ${NEEDTAGGER+$ID3V2} \
+        $ENCODER $WGET ${NEEDDISTMP3+$DISTMP3} ${NEEDCOMMENTER+$VORBISCOMMENT}
 do
 	# Cut off the command-line options we just added in
 	X=$(echo $X | cut -d' ' -f2)

Regards,

Dom.

-- 
----------(      Save the whales, collect the whole set      )----------
Dom ------(                                                  )----------
                             Htag.pl 0.0.19

To unsubscribe: echo unsubscribe | mail abcde-request@whimsica.lly.org