Ticket #26454: patch-src-makedvd.diff

File patch-src-makedvd.diff, 1.5 KB (added by danielb@…, 14 years ago)
  • ./src/makedvd

    old new  
    214214done
    215215
    216216if test -e "$1"; then
    217     DISC_NAME=$(readlink -f "$1")
     217    DISC_NAME=$(greadlink -f "$1")
    218218else
    219219    usage_error "File or DVD directory '$1' does not exist."
    220220fi
     
    302302    DISC_SUM=0
    303303    while test $i -le $NUM_VOBS; do
    304304      VOB=$(echo "$VOB_LIST" | awk -F ':' '{ print $'$i' }')
    305       VOB_SIZE=$(du -D -B M "$VOB" | awk -F ' ' '{print $1}' | tr -d M)
     305      VOB_SIZE=$(gdu -D -B M "$VOB" | awk -F ' ' '{print $1}' | tr -d M)
    306306      DISC_SUM=$(expr $VOB_SIZE \+ $DISC_SUM)
    307307      i=$(expr $i \+ 1)
    308308    done
    309     OUTDIR=$(readlink -f "$OUT_DIR")
     309    OUTDIR=$(greadlink -f "$OUT_DIR")
    310310    AVAIL_SPACE=$(df -B M -P "${OUTDIR%/*}" | awk 'NR != 1 {print $4;}' | tr -d M)
    311311
    312312    if test $DISC_SUM -gt $AVAIL_SPACE; then
     
    369369    fi
    370370
    371371    GROWISOFS_VER=$(growisofs -version | grep version | \
    372                     awk '{ print $6 }' | sed 's/,//g')
     372                    awk '{ print $6 }' | gsed 's/,//g')
    373373
    374374    # Make sure there is a blank disc to write to
    375375    probe_media
     
    424424      probe_media
    425425    fi
    426426
    427     DISC_SUM=$(du -s -B M "$OUT_DIR" | awk '{print $1}' | tr -d M)
     427    DISC_SUM=$(gdu -s -B M "$OUT_DIR" | awk '{print $1}' | tr -d M)
    428428    if test $DISC_SUM -gt $DISC_CAPACITY; then
    429429       echo $SEPARATOR
    430430       echo "Cannot continue! DVD image (${DISC_SUM}MB) exceeds the DVD's capacity (${DISC_CAPACITY}MB)."