Clean up the CD-Text output a little

[clinton/abcde.git] / abcde

diff --git a/abcde b/abcde
index 33f7128..df4c247 100755 (executable)
--- a/abcde
+++ b/abcde
@@ -118,7 +118,7 @@ f_seq_line ()
                done
                echo
        else
                done
                echo
        else

-               log error "syntax error while processing track numbers"
+               log error "syntax error while processing track numbers ($i)"

                exit 1
        fi
 }
                exit 1
        fi
 }


@@ -2272,7 +2272,7 @@ do_cdtext ()
        for TRACK in $(f_seq_row 1 $TRACKS)
        do
                TRACKM1=$(($TRACK - 1))
        for TRACK in $(f_seq_row 1 $TRACKS)
        do
                TRACKM1=$(($TRACK - 1))

-               TITLE="$(grep -E ^Track\ +$TRACK: "$ABCDETEMPDIR/cd-text" | cut -c11- | tr -d \\r\\n)"
+               TITLE="$(grep -E ^Track\ +$TRACK: "$ABCDETEMPDIR/cd-text" | tr -d \\r\\n | sed 's~^Track ..: .~~g;'"s~'$~~g")"

                echo "$TRACK: $TITLE" >> "$ABCDETEMPDIR/cddbchoices"
                sed -i "s~^TTITLE${TRACKM1}=.*~TTITLE${TRACKM1}=${TITLE}~" $ABCDETEMPDIR/cddbread.1
        done
                echo "$TRACK: $TITLE" >> "$ABCDETEMPDIR/cddbchoices"
                sed -i "s~^TTITLE${TRACKM1}=.*~TTITLE${TRACKM1}=${TITLE}~" $ABCDETEMPDIR/cddbread.1
        done


@@ -3520,7 +3520,8 @@ else
                # Range parsing code courtesy of Vincent Ho
                # Cleaned up to use shell built-ins by Charles Steinkuehler
                if [ "${1#*[^0-9-]}" != "$1" ]; then
                # Range parsing code courtesy of Vincent Ho
                # Cleaned up to use shell built-ins by Charles Steinkuehler
                if [ "${1#*[^0-9-]}" != "$1" ]; then

-                       log error "syntax error while processing track numbers"
+                       log error "syntax error while processing track numbers ($1)"
+                       exit 1

                else
                        RSTART=${1%%-*}
                        REND=${1##*-}
                else
                        RSTART=${1%%-*}
                        REND=${1##*-}