From 8d685d4857b631bc14637a7d09c75726e3b8e305 Mon Sep 17 00:00:00 2001 From: "colintu@gmail.com" Date: Thu, 19 Apr 2012 13:02:54 +0000 Subject: [PATCH] improve presentation of options/defaults when asking a question (closes issue 9) git-svn-id: http://abcde.googlecode.com/svn/trunk@310 a0fa61bc-5347-0410-a1a9-7f54aa4e1825 --- abcde | 10 +++++----- changelog | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/abcde b/abcde index 258b728..749a86a 100755 --- a/abcde +++ b/abcde @@ -1929,7 +1929,7 @@ do_discid () if [ ! -f "$ABCDETEMPDIR/discid" ]; then # Wipe and start fresh echo "abcde: $ABCDETEMPDIR/discid not found. Abcde must remove and recreate" >&2 - echo -n "this directory to continue. Continue? [y/n] (n)" >&2 + echo -n "this directory to continue. Continue [y/N]? " >&2 if [ "$INTERACTIVE" = "y" ]; then read ANSWER else @@ -2194,9 +2194,9 @@ do_localcddb () # List out disc title/author and contents do_cddbparse "${CDDBLOCALFILE}" #if [ "$CDROMREADERSYNTAX" = "flac" ] ; then - # echo -n "Embedded cuesheet entry found, use it? [y/n] (y): " >&2 + # echo -n "Embedded cuesheet entry found, use it [Y/n]? " >&2 #else - echo -n "Locally cached CDDB entry found, use it? [y/n] (y): " >&2 + echo -n "Locally cached CDDB entry found, use it [Y/n]? " >&2 #fi if [ "$INTERACTIVE" = "y" ]; then read USELOCALRESP @@ -2692,7 +2692,7 @@ do_cddbedit () echo "Looks like a Multi-Artist CD" >&2 VARIOUSARTISTS=y else - echo -n "Is the CD multi-artist? [y/n] (n): " >&2 + echo -n "Is the CD multi-artist [y/N]? " >&2 if [ "$INTERACTIVE" = "y" ]; then read VARIOUSARTISTS else @@ -2783,7 +2783,7 @@ do_cddbedit () # submit the modified file, if they want if [ "$NOSUBMIT" != "y" ]; then - echo -n "Do you want to submit this entry to $CDDBSUBMIT? [y/n] (n): " + echo -n "Do you want to submit this entry to $CDDBSUBMIT [y/N]? " read YESNO while [ "$YESNO" != "y" ] && [ "$YESNO" != "n" ] && [ "$YESNO" != "Y" ] && \ [ "$YESNO" != "N" ] && [ "$YESNO" != "" ] diff --git a/changelog b/changelog index d143ebb..9c46b50 100644 --- a/changelog +++ b/changelog @@ -15,8 +15,10 @@ abcde 2.5.1 UNRELEASED * clean up indentation on older changelog entries * remove tarball target from Makefile since dir structure has changed now that we use subversion. + * improve presentation of options/defaults when asking a question + (closes issue 9) - -- Colin Tuckley Wed, 18 Apr 2012 20:54:24 +0100 + -- Colin Tuckley Thu, 19 Apr 2012 13:55:00 +0100 abcde 2.5.0 -- 2.20.1