From f0582268a00c97c92f40f3a218c6b195c50e5239 Mon Sep 17 00:00:00 2001 From: data Date: Sat, 10 Dec 2005 20:53:04 +0000 Subject: [PATCH] Reworked comparison for numerical answer when selecting a CDDB output. Config file rework with some corrections. git-svn-id: http://abcde.googlecode.com/svn/trunk@165 a0fa61bc-5347-0410-a1a9-7f54aa4e1825 --- abcde | 13 ++++++------- debian/changelog | 11 +++++++++++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/abcde b/abcde index 1595cf9..1ce8ba8 100755 --- a/abcde +++ b/abcde @@ -1852,16 +1852,15 @@ do_cddbedit () echo -n "Which entry would you like abcde to use (0 for none)? [0-$CDDBCHOICES]: " >&2 read CDDBCHOICE [ X"$CDDBCHOICE" = "X" ] && CDDBCHOICE=1 - if echo $CDDBCHOICE | egrep -q "[[:digit:]]+,[[:digit:]]+" ; then + if echo $CDDBCHOICE | egrep -q "[[:space:]]*[[:digit:]]+,[[:digit:]]+[[:space:]]*" ; then if [ ! X"$DIFF" = "X" ]; then - PARSECHOICE1=$(echo $CDDBCHOICE | cut -d"," -f1) - PARSECHOICE2=$(echo $CDDBCHOICE | cut -d"," -f2) + PARSECHOICE1=$(echo $CDDBCHOICE | cut -d"," -f1 | xargs printf %d 2>/dev/null) + PARSECHOICE2=$(echo $CDDBCHOICE | cut -d"," -f2 | xargs printf %d 2>/dev/null) if [ $PARSECHOICE1 -lt 1 ] || [ $PARSECHOICE1 -gt $CDDBCHOICES ] || \ [ $PARSECHOICE2 -lt 1 ] || [ $PARSECHOICE2 -gt $CDDBCHOICES ] || \ [ $PARSECHOICE1 -eq $PARSECHOICE2 ]; then echo "Invalid diff range. Please select two coma-separated numbers between 1 and $CDDBCHOICES" >&2 else - # We parse the 2 choices to diff, store them in temporary files and diff them. for PARSECHOICE in $(echo $CDDBCHOICE | tr , \ ); do do_cddbparse "$ABCDETEMPDIR/cddbread.$PARSECHOICE" > "$ABCDETEMPDIR/cddbread.parsechoice.$PARSECHOICE" @@ -1877,10 +1876,10 @@ do_cddbedit () else echo "The diff program was not found in your path. Please choose a number between 0 and $CDDBCHOICES." >&2 fi - else + elif echo $CDDBCHOICE | egrep -q "[[:space:]]*[[:digit:]]+[[:space:]]*" ; then + # Make sure we get a valid choice + CDCHOICENUM=$(echo $CDDBCHOICE | xargs printf %d 2>/dev/null) if [ $CDCHOICENUM -lt 0 ] || [ $CDCHOICENUM -gt $CDDBCHOICES ]; then - # Make sure we get a valid choice - CDCHOICENUM=$(echo $CDDBCHOICE | xargs printf %d 2>/dev/null) echo "Invalid selection. Please choose a number between 0 and $CDDBCHOICES." >&2 fi fi diff --git a/debian/changelog b/debian/changelog index e16cc21..4e5c3ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +abcde (2.3.99.2-1) unstable; urgency=low + + * Missing bits in the 2.3.99.1 changelog: + - Man page: added information about -z (Debug option). + - Corrected config file with the BATCHNORM/NOGAP split + (Closes: #337622). + - Uses /bin/bash for the time being... We need to get some substitution + functions/operations for the bashisms we have: Closes: #337139. + + -- Jesus Climent Thu, 1 Dec 2005 16:45:07 +0200 + abcde (2.3.99.1-1) unstable; urgency=low * Both -z and -C unset EJECTCD to avoid ejecting the CD when a) we are -- 2.20.1