From: EinvalSledge@gmail.com <EinvalSledge@gmail.com@a0fa61bc-5347-0410-a1a9-7f54aa4e1825>
Date: Thu, 19 Apr 2012 16:31:38 +0000 (+0000)
Subject:     + Add suggested diskutil code to auto-detect the CD on OS X.
X-Git-Url: https://git.hcoop.net/clinton/abcde.git/commitdiff_plain/df2e617f90b059c1844a04e79cc936f270f082e2?hp=9ad72a6236f5515fe1c67b468e38554851cda495

+ Add suggested diskutil code to auto-detect the CD on OS X.
      Closes issue 45.


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

diff --git a/abcde b/abcde
index 31f9c48..975bff3 100755
--- a/abcde
+++ b/abcde
@@ -3302,6 +3302,8 @@ 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 a641baf..381c1c2 100644
--- a/changelog
+++ b/changelog
@@ -17,6 +17,8 @@ abcde 2.5.1 UNRELEASED
   * Updates for CD device detection:
     + Look for /dev/sr0, in case /dev/cdrom doesn't exist.
       Closes issue 52.
+    + Add suggested diskutil code to auto-detect the CD on OS X.
+      Closes issue 45.
 
   [ Colin Tuckley ]
   * replace deprecated egrep with grep -E (Closes issue 24).