X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/0c00a676eab39e7d209c526a93c82b108c8f3d0d..056a23cdab01160fc9cf8289620236c72bbb8037:/abcde

diff --git a/abcde b/abcde
index 5c15c2c..21422e8 100755
--- a/abcde
+++ b/abcde
@@ -1,6 +1,8 @@
 #!/bin/bash
 # Copyright (c) 1998-2001 Robert Woodcock <rcw@debian.org>
 # Copyright (c) 2003-2006 Jesus Climent <jesus.climent@hispalinux.es>
+# Copyright (c) 2009-2012 Colin Tuckley <colint@debian.org>
+# Copyright (c) 2012      Steve McIntyre <93sam@@debian.org>
 # This code is hereby licensed for public consumption under either the
 # GNU GPL v2 or greater, or Larry Wall's Artistic license - your choice.
 #
@@ -13,7 +15,7 @@
 #
 # $Id$
 
-VERSION='2.5.3-UNRELEASED'
+VERSION='2.5.4-UNRELEASED'
 
 usage ()
 {
@@ -826,9 +828,9 @@ do_tag ()
 						--comment=::"$COMMENTOUTPUT" -A "$DALBUM" \
 						-a "$TRACKARTIST" -t "$TRACKNAME" -Y "$CDYEAR" \
 						-G "$GENREID" -n "${TRACKNUM:-$1}" \
-						"${TRACKNUM:+-N $TRACKS}" \
-						"${ENCODING:+--set-encoding=$ENCODING}" \
-						"${TPE2:+--set-user-text-frame=TPE2:$TPE2}" \
+						${TRACKNUM:+-N "$TRACKS"} \
+						${ENCODING:+--set-encoding="$ENCODING"} \
+						${TPE2:+--set-text-frame=TPE2:"$TPE2"} \
 						"$ABCDETEMPDIR/track$1.$OUTPUT"
 					;;
 				# FIXME # Still not activated...
@@ -3874,8 +3876,9 @@ if [ "$ID3TAGV" = "1" ]; then
 	TAGGER="$ID3"
 	TAGGEROPTS="$ID3OPTS"
 else
-	TAGGER="$ID3V2"
+	TAGGER="$EYED3"
 	TAGGEROPTS="$ID3V2OPTS"
+	ID3SYNTAX=eyed3
 fi
 
 # NOGAP is specific to lame. Other encoders fail ...
@@ -4089,7 +4092,7 @@ if [ "$DOCDDB" = "y" ]; then
 			esac
 		fi
 		CHOICE=$(checkstatus cddb-choice)
-		if [ $CHOICE = 0 ] ; then
+		if [ "$CHOICE" = 0 ] ; then
 			# We don't have any information at all; try to fall back
 			# to CD-Text for basic information
 			vecho "No CDDB information found, trying cdtext from the CD"