From a1d79009e6196e64d1b369db28ea1eabe477081e Mon Sep 17 00:00:00 2001
From: "EinvalSledge@gmail.com"
 <EinvalSledge@gmail.com@a0fa61bc-5347-0410-a1a9-7f54aa4e1825>
Date: Thu, 19 Apr 2012 16:20:00 +0000
Subject: [PATCH] On OS X, switch from disktool to diskutil. (Closes issue 43).

git-svn-id: http://abcde.googlecode.com/svn/trunk@315 a0fa61bc-5347-0410-a1a9-7f54aa4e1825
---
 abcde     | 14 +++++++-------
 changelog |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/abcde b/abcde
index f53d2c9..acbe4bf 100755
--- a/abcde
+++ b/abcde
@@ -1741,7 +1741,7 @@ do_discid ()
 		vecho -n "Getting CD track info... "
 		# In OSX, unmount the disc before a query
 		if [ "$OSFLAVOUR" = "OSX" ]; then
-			disktool -u ${CDROM#/dev/}
+			diskutil unmount ${CDROM#/dev/}
 		fi
 		case "$CDROMREADERSYNTAX" in
 			flac)
@@ -1813,7 +1813,7 @@ do_discid ()
 		fi
 		# In OSX, remount the disc again
 		if [ "$OSFLAVOUR" = "OSX" ]; then
-			disktool -m ${CDROM#/dev/}
+			diskutil mount ${CDROM#/dev/}
 		fi
 		WEHAVEACD=y
 		DISCID=$(echo $TRACKINFO | cut -f1 -d' ')
@@ -2887,7 +2887,7 @@ do_cdread ()
 		cdda2wav | icedax)
 			if [ "$OSFLAVOUR" = "OSX" ] ; then
 				# Hei, we have to unmount the device before running anything like cdda2wav/icedax in OSX
-				disktool -u ${CDROM#/dev/} 0
+				diskutil unmount ${CDROM#/dev/} 0
 				# Also, in OSX the cdrom device for cdda2wav/icedax changes...
 				CDDA2WAVCDROM="IODVDServices"
 			elif [ "$OSFLAVOUR" = "FBSD" ] ; then
@@ -3225,8 +3225,8 @@ if [ X$(uname) = "XFreeBSD" ] ; then
 elif [ X$(uname) = "XDarwin" ] ; then
 	HTTPGET=curl
 	OSFLAVOUR=OSX
-	# We should have disktool in OSX, but let's be sure...
-	NEEDDISKTOOL=y
+	# We should have diskutil in OSX, but let's be sure...
+	NEEDDISKUTIL=y
 	CDROMREADERSYNTAX=cddafs
 elif [ X$(uname) = "XOpenBSD" ] ; then
 	HTTPGET=wget
@@ -3913,7 +3913,7 @@ for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $MP3ENCODER \
 	${NEEDHTTPGET+$HTTPGET} ${NEEDDISTMP3+$DISTMP3} \
 	${NEEDCOMMENTER+$VORBISCOMMENT} ${NEEDMETAFLAC+$METAFLAC} \
 	${NEEDNORMALIZER+$NORMALIZER} ${NEEDEJECT+$EJECT} \
-	${NEEDDISKTOOL+disktool} ${NEEDCDSPEED+$CDSPEED} \
+	${NEEDDISKUTIL+diskutil} ${NEEDCDSPEED+$CDSPEED} \
 	${NEEDVORBISGAIN+$VORBISGAIN} ${NEEDMP3GAIN+$MP3GAIN} \
 	${NEEDMPPGAIN+$MPPGAIN} ${NEEDCUEREADER+$CUEREADER} \
 	${NEEDCUE2DISCID+$CUE2DISCID}
@@ -4134,7 +4134,7 @@ if [ "$EJECTCD" = "y" ] && [ -x $(which $EJECT) ]; then
 		cd="$(echo $CDROM | sed -e 's=.*/==;s=[a-h]$==;')"
 		$eject $EJECTOPTS $cd
 	elif [ X"$(uname)" = X"Darwin" ] ; then
-		disktool -e ${CDROM#/dev/} 0
+		diskutil eject ${CDROM#/dev/} 0
 	else
 		$EJECT $EJECTOPTS "$CDROM"
 	fi
diff --git a/changelog b/changelog
index 9344c8b..5cb7a29 100644
--- a/changelog
+++ b/changelog
@@ -13,6 +13,7 @@ abcde 2.5.1 UNRELEASED
   * Fix aac tagging. (Closes issue 7).
     Thanks to Andrew Strong for forwarding the patch.
   * Add ATOMICPARSLEY=AtomicParsley (Closes issue 37).
+  * On OS X, switch from disktool to diskutil. (Closes issue 43).
 
   [ Colin Tuckley ]
   * replace deprecated egrep with grep -E (Closes issue 24).
-- 
2.20.1