Export CDDEV to the environment if we set it here.

[flac-archive] / fa-rip

diff --git a/fa-rip b/fa-rip
index 55b2fb26791cf7d69cd1f59afaa159ae594c8df7..557050d507016fdaeb7b50efe62aa780c9a20edb 100755 (executable)
--- a/fa-rip
+++ b/fa-rip
@@ -21,16 +21,17 @@ if [[ -z ${CDDEV} ]]; then
         echo 'CDDEV environment variable not set, defaults did not work'
         exit 2
     fi
+    export CDDEV
 fi
 
-discid=($(cd-discid ${CDDEV}))
+dir=$(mktemp -d flac-archive.XXXXXXXXXX)
+cd ${dir}
 
-[[ -d $discid[1] ]] || mkdir $discid[1]
-cd $discid[1]
+cdrdao read-toc --device ${CDDEV} --driver generic-mmc toc
+toc2cue toc cue
 
-eval fa-tags $discid &
+trackcount=$(grep -c 'TRACK.*AUDIO' cue)
 
-cdrdao read-toc --device ${CDDEV} --driver generic-mmc toc
-toc2cue toc cue &
+fa-tags ${trackcount}
 
-exec cdparanoia -d ${CDDEV} 1-$discid[2] wav
+exec cdparanoia -d ${CDDEV} 1-$(grep -c 'TRACK.*AUDIO' cue) wav