X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/c9c2ca2730a901eb83ebbdb15522bd2a5849b64f..f75dae439e001c86b2fdcb0c58c2898d0b1df806:/cddb-tool

diff --git a/cddb-tool b/cddb-tool
index b760e26..4e1e79e 100755
--- a/cddb-tool
+++ b/cddb-tool
@@ -2,7 +2,7 @@
 
 # Copyright (C) 1999 Nathaniel Smith <njs@uclink4.berkeley.edu>
 # Copyright (C) 1999, 2000, 2001 Robert Woodcock <rcw@debian.org>
-# Copyright (C) 2003 Jesus Climent <jesus.climent@hispalinux.es>
+# Copyright (C) 2003, 2005 Jesus Climent <jesus.climent@hispalinux.es>
 # This code is hereby licensed for public consumption under either the
 # GNU GPL v2 or greater, or Larry Wall's Artistic License - your choice.
 #
@@ -122,7 +122,7 @@ parse)	# takes 1 argument, a filename, and dumps out a sh parseable version
 	DARTISTALBUM=$(grep ^DTITLE= "$CDDBFILE" | cut -f2- -d= | tr -d \\n | sed 's- / -~-g' | tr -d \[:cntrl:\])
 	DARTIST=$(echo "$DARTISTALBUM" | cut -f1 -d~ | sed 's,\\,\\\\,g;s,\([\"\$\`]\),\\\1,g' | tr -d \[:cntrl:\])
 	DALBUM=$(echo "$DARTISTALBUM" | cut -f2 -d~ | sed 's,\\,\\\\,g;s,\([\"\$\`]\),\\\1,g' | tr -d \[:cntrl:\])
-	CDDBGENRE=$(grep '^#CATEGORY=' "$CDDBFILE" | cut -f2- -d=)
+	CDDBGENRE=$(grep '^#CATEGORY=' "$CDDBFILE" | cut -f2- -d= | tr -d \[:cntrl:\])
 	if grep "^DYEAR" "$CDDBFILE" 2>&1 > /dev/null ; then
 		CDYEAR=$(grep "^DYEAR" "$CDDBFILE" | cut -f2- -d= | tr -d \[:cntrl:\])
 	elif grep YEAR "$CDDBFILE" 2>&1 > /dev/null ; then
@@ -192,7 +192,7 @@ send) # cddb-tool send filename email@address
 	FILE="$1"
 	ADDRESS="$2"
 	DISCID=$(grep ^DISCID= "$FILE" | cut -f2 -d= | tr -d \[:cntrl:\])
-	CDDBGENRE=$(grep '^#CATEGORY=' "$FILE" | cut -f2- -d=)
+	CDDBGENRE=$(grep '^#CATEGORY=' "$FILE" | cut -f2- -d= | tr -d \[:cntrl:\])
 	grep -v "^#CATEGORY=" "$FILE" | mail -s "cddb $CDDBGENRE $DISCID" "$ADDRESS"
 	;;