Added a check for the KEEPWAVS variable before announcing we are cancelling it

[clinton/abcde.git] / abcde

diff --git a/abcde b/abcde
index bd230a5..c06981f 100755 (executable)
--- a/abcde
+++ b/abcde
@@ -11,7 +11,7 @@
 # Copyright for this work is to expire January 1, 2010, after which it
 # shall be public domain.
 
-VERSION="2.3.99-$Id $"
+VERSION="2.3.99"
 
 usage ()
 {
@@ -587,6 +587,7 @@ return 0
 do_tag ()
 {
        COMMENTOUTPUT="$(eval echo ${COMMENT})"
+       CDDBDISCID=$(echo $TRACKINFO | cut -d' ' -f1)
        run_command '' echo "Tagging track $1 of $TRACKS: $TRACKNAME..."
        # If we want to start the tracks with a given number, we need to modify the
        # TRACKNUM value before evaluation
@@ -2719,7 +2720,9 @@ do
                        [ "$MPPENCODERSYNTAX" = "default" ] && MPPENCODERSYNTAX=mppenc
                        ;;
                wav)
-                       vecho "Unsetting the KEEPWAVS option, since the resulting wav files were requested..."
+                       if [ "$KEEPWAVS" = "y" ]; then
+                               vecho "Unsetting the KEEPWAVS option, since the resulting wav files were requested..."
+                       fi
                        KEEPWAVS=move
                        ;;
                *)      echo "abcde error: Invalid OUTPUTTYPE defined" >&2