Added -f as the default option in FLACOPTIONS.

The Moving echoes now are only printed if there is not foreground activity

git-svn-id: http://abcde.googlecode.com/svn/trunk@88 a0fa61bc-5347-0410-a1a9-7f54aa4e1825

diff --git a/abcde b/abcde
index 75c382c..d97e1eb 100755 (executable)
--- a/abcde
+++ b/abcde
@@ -967,13 +967,13 @@ do_move ()
                OUTPUTFILEDIR=$(dirname "$OUTPUTDIR/$OUTPUTFILE")
                # mkdir -p shouldn't return an error if the directory already exists
                mkdir -p "$OUTPUTFILEDIR"
                OUTPUTFILEDIR=$(dirname "$OUTPUTDIR/$OUTPUTFILE")
                # mkdir -p shouldn't return an error if the directory already exists
                mkdir -p "$OUTPUTFILEDIR"

-               vecho "Moving $ABCDETEMPDIR/track$1.$OUTPUT to $OUTPUTDIR/$OUTPUTFILE.$OUTPUT"
+               run_command '' vecho "Moving track$1.$OUTPUT to $OUTPUTDIR/$OUTPUTFILE.$OUTPUT"

                run_command movetrack-$1 mv "$ABCDETEMPDIR/track$1.$OUTPUT" "$OUTPUTDIR/$OUTPUTFILE.$OUTPUT"
                # Lets move the cue file
                if CUEFILE=$(checkstatus cuefile) >/dev/null ; then 
                        if [ -r "$ABCDETEMPDIR/$CUEFILE" ]; then
                                if checkstatus movecue-$OUTPUT; then :; else
                run_command movetrack-$1 mv "$ABCDETEMPDIR/track$1.$OUTPUT" "$OUTPUTDIR/$OUTPUTFILE.$OUTPUT"
                # Lets move the cue file
                if CUEFILE=$(checkstatus cuefile) >/dev/null ; then 
                        if [ -r "$ABCDETEMPDIR/$CUEFILE" ]; then
                                if checkstatus movecue-$OUTPUT; then :; else

-                                       vecho "Copying cue file to its destination directory..."
+                                       run_command '' vecho "Copying cue file to its destination directory..."

                                        if checkstatus onetrack >/dev/null ; then
                                                case $OUTPUT in
                                                        # NOTE: Creating a cue file with the 3-char-extension files is to comply with
                                        if checkstatus onetrack >/dev/null ; then
                                                case $OUTPUT in
                                                        # NOTE: Creating a cue file with the 3-char-extension files is to comply with

diff --git a/abcde.conf b/abcde.conf
index 84c20ec..201901b 100644 (file)
--- a/abcde.conf
+++ b/abcde.conf
@@ -142,7 +142,7 @@
 #OGGENCOPTS=
 
 # FLAC:
 #OGGENCOPTS=
 
 # FLAC:

-#FLACOPTS=
+#FLACOPTS="-f"

 
 # Speex:
 #SPEEXENCOPTS=
 
 # Speex:
 #SPEEXENCOPTS=

diff --git a/debian/changelog b/debian/changelog
index 28f7978..b880764 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,8 +27,10 @@ abcde (2.3.0-1) unstable; urgency=low
   * Added CDPARANOIACDROMBUS option to define -d in case of using IDE and SCSI
     in case of using ide-scsi emulation layer (Closes: #290768).
   * Define metaflac in abcde.conf (Closes: #303555)
   * Added CDPARANOIACDROMBUS option to define -d in case of using IDE and SCSI
     in case of using ide-scsi emulation layer (Closes: #290768).
   * Define metaflac in abcde.conf (Closes: #303555)

+  * Added the default "-f" option to the configuration file, to represent the
+    actual default option.

 
 

- -- Jesus Climent <jesus.climent@hispalinux.es>  Wed, 10 Aug 2005 07:00:26 +0300
+ -- Jesus Climent <jesus.climent@hispalinux.es>  Thu, 11 Aug 2005 00:47:27 +0300

 
 abcde (2.2.6-1) unstable; urgency=low
 
 
 abcde (2.2.6-1) unstable; urgency=low