[Abcde-users] [abcde] r377 committed - Fine tuning to the EJECT function of abcde in MacOSX....

[abcde at googlecode.com]

Revision: 377
Author:   andrew at andrews-corner.org
Date:     Sun Apr  7 19:21:27 2013
Log:      Fine tuning to the EJECT function of abcde in MacOSX.
Thanks to mick.saunders and sanelson for the report and patch.
Closes issue 84.

http://code.google.com/p/abcde/source/detail?r=377

Modified:
  /trunk/abcde

=======================================
--- /trunk/abcde	Wed Dec 19 05:53:37 2012
+++ /trunk/abcde	Sun Apr  7 19:21:27 2013
@@ -3361,6 +3361,8 @@
  	# 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 @@

  # 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 @@
  		$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