Ticket #23948: abcde-10.6.diff

File abcde-10.6.diff, 2.0 KB (added by chrisg@…, 15 years ago)
  • /opt/local/bin/abcde

    old new  
    11011101                vecho -n "Getting CD track info... "
    11021102                # In OSX, unmount the disc before a query
    11031103                if [ "$OSFLAVOUR" = "OSX" ]; then
    1104                 disktool -u ${CDROM#/dev/}
     1104                diskutil unmount ${CDROM#/dev/}
    11051105                fi
    11061106                TRACKINFO=$($CDDISCID $CDROM)
    11071107                # Make sure there's a CD in there by checking cd-discid's return code
     
    11111111                fi
    11121112                # In OSX, remount the disc again
    11131113                if [ "$OSFLAVOUR" = "OSX" ]; then
    1114                         disktool -m ${CDROM#/dev/}
     1114                        diskutil mount ${CDROM#/dev/}
    11151115                fi
    11161116                WEHAVEACD=y
    11171117        else
     
    19211921                cdda2wav)
    19221922                        if [ "$OSFLAVOUR" = "OSX" ] ; then
    19231923                                # Hei, we have to unmount the device before running anything like cdda2wav in OSX
    1924                                 disktool -u ${CDROM#/dev/} 0
     1924                                diskutil unmount ${CDROM#/dev/} 0
    19251925                                # Also, in OSX the cdrom device for cdda2wav changes...
    19261926                                CDDA2WAVCDROM="IODVDServices"
    19271927                        elif [ "$OSFLAVOUR" = "FBSD" ] ; then
     
    21722172elif [ X$(uname) = "XDarwin" ] ; then
    21732173        HTTPGET=curl
    21742174        OSFLAVOUR=OSX
    2175         # We should have disktool in OSX, but let's be sure...
    2176         NEEDDISKTOOL=y
     2175        # We should have diskutil in OSX, but let's be sure...
     2176        NEEDDISKUTIL=y
    21772177        CDROMREADERSYNTAX=cddafs
    21782178elif [ X$(uname) = "XOpenBSD" ] ; then
    21792179        HTTPGET=wget
     
    26762676        ${NEEDHTTPGET+$HTTPGET} ${NEEDDISTMP3+$DISTMP3} \
    26772677        ${NEEDCOMMENTER+$VORBISCOMMENT} ${NEEDMETAFLAC+$METAFLAC} \
    26782678        ${NEEDNORMALIZER+$NORMALIZER} ${NEEDEJECT+$EJECT} \
    2679         ${NEEDDISKTOOL+disktool} ${NEEDCDSPEED+$CDSPEED} \
     2679        ${NEEDDISKTOOL+diskutil} ${NEEDCDSPEED+$CDSPEED} \
    26802680        ${NEEDVORBISGAIN+$VORBISGAIN} ${NEEDCUEREADER+$CUEREADER}
    26812681do
    26822682        # Cut off the command-line options we just added in
     
    28442844                cd="$(echo $CDROM | sed -e 's=.*/==;s=[a-h]$==;')"
    28452845                $eject $EJECTOPTS $cd
    28462846        elif [ X"$(uname)" = X"Darwin" ] ; then
    2847                 disktool -e ${CDROM#/dev/} 0
     2847                diskutil eject ${CDROM#/dev/} 0
    28482848        else
    28492849                $EJECT $EJECTOPTS $CDROM
    28502850        fi