[tovid] r3408 committed - Remove author options from usage output, as makexml...

0 views
Skip to first unread message

to...@googlecode.com

unread,
Dec 5, 2011, 11:52:18 PM12/5/11
to tovi...@googlegroups.com
Revision: 3408
Author: grepper
Date: Mon Dec 5 20:49:57 2011
Log: Remove author options from usage output, as makexml
is no longer part of tovid as of version 0.35.
Remove time suffix for sleep command for compatibility.

http://code.google.com/p/tovid/source/detail?r=3408

Modified:
/trunk/tovid/src/makedvd

=======================================
--- /trunk/tovid/src/makedvd Tue Jun 28 16:58:26 2011
+++ /trunk/tovid/src/makedvd Mon Dec 5 20:49:57 2011
@@ -44,15 +44,12 @@
EOF`

USAGE=`cat << EOF
-Usage: tovid dvd [OPTIONS] FILE.xml
- or: tovid dvd [OPTIONS] DVD_DIR
-
-With FILE.xml, containing dvdauthor XML as generated by 'makexml',
-or DVD_DIR, a directory containing a DVD filesystem (VIDEO_TS, namely).
+Usage: tovid dvd [OPTIONS] DVD_DIR
+
+DVD_DIR: a directory containing a DVD filesystem (VIDEO_TS, namely).

OPTIONS may be any of the following:

- -author Create DVD filesystem from FILE.xml
-burn Burn DVD filesystem from DVD_DIR
-eject Eject the DVD tray after burning
-device DEVFS_NAME DVD recorder device name (Default: /dev/dvdrw)
@@ -228,6 +225,8 @@

# See what kind of file we're working with, and do the right thing
# Author an XML file
+# This first if block is no longer really needed as makexml has
+# been removed from tovid but I will leave it here for now.
if echo "$DISC_NAME" | grep -q -i '\.xml$'; then
DVDAUTHOR_XML="$DISC_NAME"
DO_AUTHOR=:
@@ -339,7 +338,7 @@
export VIDEO_FORMAT=ntsc
echo -e '\n***'
echo "No default video format defined!!!"
- echo "Was this xml created by a recent version of tovid/makexml?"
+ echo "Was this xml created by a recent version of tovid/todisc?"
echo "Using default video format of 'ntsc'."
echo "Run 'export VIDEO_FORMAT=\"pal\"' if this is wrong for your
disc."
echo -e '\n***'
@@ -416,7 +415,7 @@
echo "Found $DISC_STATUS $DISC_TYPE. Please insert a usable DVD
into $DVDRW_DEVICE."
for COUNTER in {10..1}; do
printf "Trying again in %2s seconds...\r" $((COUNTER *
TIME_SCALE))
- sleep ${TIME_SCALE}s
+ sleep $TIME_SCALE
done
((COUNT++))
echo

Reply all
Reply to author
Forward
0 new messages