* Fix finding $CDROM on OS X. Thanks to niederstrasser for the patch.

    Closes issue 71.

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

diff --git a/abcde b/abcde
index c011a51..edbc78c 100755 (executable)
--- a/abcde
+++ b/abcde
@@ -3373,6 +3373,8 @@ fi
 if [ "$CDROM" = "" ] ; then
        if [ -e /dev/cdroms/cdrom0 ]; then
                CDROM=/dev/cdroms/cdrom0
+       elif [ "$OSFLAVOUR" = "OSX" ] && [[ $(diskutil list) =~ CD_part.*(disk.)$'\n' ]]; then
+               CDROM=/dev/${BASH_REMATCH[1]}
        elif [ -e /dev/cdrom ]; then
                CDROM=/dev/cdrom
        elif [ -e /dev/sr0 ]; then
@@ -3383,8 +3385,6 @@ if [ "$CDROM" = "" ] ; then
                CDROM=/dev/acd0c
        elif [ -e /dev/disk1 ]; then
                CDROM=/dev/disk1
-       elif [ "$OSFLAVOUR" = "OSX" ] && [[ $(diskutil list) =~ CD_part.*(disk.)$'\n' ]]; then
-               CDROM=/dev/${BASH_REMATCH[1]}
        fi
 fi
 

diff --git a/changelog b/changelog
index c903d1b..4dfd578 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,5 +1,8 @@
 abcde 2.5.5
 
+  * Fix finding $CDROM on OS X. Thanks to niederstrasser for the patch.
+    Closes issue 71.
+
  -- Steve McIntyre <93sam@debian.org>  Tue, 18 Sep 2012 12:42:11 +0100
 
 abcde 2.5.4