X-Git-Url: https://diplodocus.org/git/flac-archive/blobdiff_plain/bbb47ac8a49e5cfa41d7fd3b5c584b76ff07ac4f..8c98014a57f590f5a0e473909ccb69e582893e7c:/fa-rip

diff --git a/fa-rip b/fa-rip
index eabf52e..627ac73 100755
--- 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,16 +21,16 @@ 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)