Don't count tracks twice.

[flac-archive] / fa-rip

diff --git a/fa-rip b/fa-rip
index eabf52ea97878939f1418511c60f3aaaf190846d..c3316484f83c125d70f2b372311ac1476fcb3da5 100755 (executable)
--- a/fa-rip
+++ b/fa-rip
@@ -3,12 +3,15 @@
 # $Id$
 
 set -e
-setopt NULL_GLOB
 
-get_cddev () {
-    local raw
+function get_cddev {
+    typeset raw
     raw=$(sysctl -n kern.rawpartition > /dev/null | awk '{printf "%c",97+$0}')
 
+    if [[ -n ${ZSH_VERSION} ]]; then
+        setopt NULL_GLOB
+    fi
+
     for CDDEV in /dev/{cdroms/cdrom*,cdrom*,rcd*${raw},{a,}cd*c}; do
         [[ -e ${CDDEV} ]] && return 0
     done
@@ -18,19 +21,19 @@ get_cddev () {
 
 if [[ -z ${CDDEV} ]]; then
     if ! get_cddev; then
-        echo 'CDDEV environment variable not set, defaults did not work'
+        echo 'CDDEV environment variable not set, defaults did not work' >&2
         exit 2
     fi
+    export CDDEV
 fi
 
 dir=$(mktemp -d flac-archive.XXXXXXXXXX)
 cd ${dir}
 
-cdrdao read-toc --device ${CDDEV} --driver generic-mmc toc
-toc2cue toc cue
+mkcue ${CDDEV} > cue
 
 trackcount=$(grep -c 'TRACK.*AUDIO' cue)
 
 fa-tags ${trackcount}
 
-exec cdparanoia -d ${CDDEV} 1-$(grep -c 'TRACK.*AUDIO' cue) wav
+exec cdparanoia -d ${CDDEV} 1-${trackcount} wav