From 719a9712b01d66957d0313457c46dfa6652d0d37 Mon Sep 17 00:00:00 2001 From: "andrew@andrews-corner.org" Date: Mon, 8 Apr 2013 02:21:27 +0000 Subject: [PATCH 1/1] Fine tuning to the EJECT function of abcde in MacOSX. Thanks to mick.saunders and sanelson for the report and patch. Closes issue 84. git-svn-id: http://abcde.googlecode.com/svn/trunk@377 a0fa61bc-5347-0410-a1a9-7f54aa4e1825 --- abcde | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/abcde b/abcde index 1705fab..dd56fc2 100755 --- a/abcde +++ b/abcde @@ -3361,6 +3361,8 @@ elif [ X$(uname) = "XDarwin" ] ; then # We should have diskutil in OSX, but let's be sure... NEEDDISKUTIL=y CDROMREADERSYNTAX=cddafs + # We won't find the eject program in OSX, and doing checkexec will fail further below... + unset EJECT elif [ X$(uname) = "XOpenBSD" ] ; then HTTPGET=wget MD5SUM=md5 @@ -4285,7 +4287,7 @@ post_read # We are now finished with the cdrom - it can be safely ejected. Note that # abcde will not have completed yet. -if [ "$EJECTCD" = "y" ] && [ -x $(which $EJECT) ]; then +if [ "$EJECTCD" = "y" ]; then # We check if the disk we are processing is actually the disk inside the # CD tray. If not, we do not eject the CD, since it might be so that the # user ejected it manually. @@ -4302,7 +4304,7 @@ if [ "$EJECTCD" = "y" ] && [ -x $(which $EJECT) ]; then $eject $EJECTOPTS $cd elif [ X"$(uname)" = X"Darwin" ] ; then diskutil eject ${CDROM#/dev/} 0 - else + elif [ -x $(which $EJECT) ]; then $EJECT $EJECTOPTS "$CDROM" fi #fi -- 2.20.1