[vorbis-tools] 02/02: Improve vorbistagedit: - allow support for .oga, .ogv, .ogx, and .spx files (LP: #313529) - make '-v' option show version (LP: #1005273) - show usage and exit with code 1 if no arguments given (LP: #1005278) - add information about OGG extensions in manual page. Patch from Aditya Vaidya and Ubuntu.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository vorbis-tools.

commit 53d93a4f243dc44abb3694a94c487813fbddbeee
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Wed Oct 22 21:27:57 2014 +0200

    Improve vorbistagedit:
     - allow support for .oga, .ogv, .ogx, and .spx files (LP: #313529)
     - make '-v' option show version (LP: #1005273)
     - show usage and exit with code 1 if no arguments given (LP: #1005278)
     - add information about OGG extensions in manual page.
    Patch from Aditya Vaidya and Ubuntu.
---
 debian/extra/vorbistagedit   | 14 +++++++++++---
 debian/extra/vorbistagedit.1 |  8 +++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/debian/extra/vorbistagedit b/debian/extra/vorbistagedit
index 3156b23..61eb2c7 100644
--- a/debian/extra/vorbistagedit
+++ b/debian/extra/vorbistagedit
@@ -19,12 +19,19 @@ versioninfo() {
 usage() {
   versioninfo
   echo
-  echo Usage: $ME file1.ogg [file2.ogg [file3.ogg ...]] >&2
-  echo
+  echo Usage: $ME file1 [file2 [file3 ...]] >&2
+  echo .oga, .ogg, .ogv, .ogx, and .spx are the >&2
+  echo supported file extensions >&2
+  echo 
   echo If no filenames are given, the list of filenames >&2
   echo is read from stdin, one per line. >&2
 }
 
+if [ $# -eq 0 ]; then
+  usage
+  exit 1
+fi
+
 for opt in $(getopt -n $ME -l version,help -o Vh? -- $@); do
   case $opt in
     --version|-V)
@@ -36,6 +43,7 @@ for opt in $(getopt -n $ME -l version,help -o Vh? -- $@); do
     --) :;;
     -*)
       echo "E: $ME: invalid argument: $opt" >&2
+      usage
       exit 1;;
     *) :;;
   esac
@@ -76,7 +84,7 @@ _eof
 
 for i in "$@"; do
   case "$i" in
-    *.ogg)
+    *.ogg|*.oga|*.ogv|*.ogx|*.spx)
       if [ ! -r "$i" ]; then
         echo "E: $ME: unreadable file: $i" >&2
         exit 2
diff --git a/debian/extra/vorbistagedit.1 b/debian/extra/vorbistagedit.1
index 45950d8..08cfa96 100644
--- a/debian/extra/vorbistagedit.1
+++ b/debian/extra/vorbistagedit.1
@@ -5,8 +5,8 @@ vorbistagedit \- allows batch editing of vorbis comments with an editor
 
 .SH "SYNOPSIS"
 .B vorbistagedit
-.I file1.ogg 
-.BI [ \|file2.ogg \ \|[ \|file3.ogg\ ... \|] \| ]
+.I file1 
+.BI [ \|file2 \ \|[ \|file3\ ... \|] \| ]
 .PP
 .B vorbistagedit
 .BR [ \|--version | \-V | \-v\| ]
@@ -23,7 +23,9 @@ vorbistagedit \- allows batch editing of vorbis comments with an editor
 allows batch editing of vorbis comments with an editor.\ If more than one OGG
 Vorbis file is specified,
 .B vorbistagedit
-opens a unique editor for all files given. 
+opens a unique editor for all files given. The supported file extensions for
+.B vorbistagedit
+are .oga, .ogg, .ogv, .ogx, and .spx.
 
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xiph/vorbis-tools.git