[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 3/3] virt-pki-validate: add --help/--version option



Another program gains --help/--version :)

* tools/virt-pki-validate.in: Add option parsing.  Update
documentation to match.
* tools/Makefile.am (virt-pki-validate): Substitute version.

Signed-off-by: Eric Blake <eblake redhat com>
---
 tools/Makefile.am          |  5 +++--
 tools/virt-pki-validate.in | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 03c9fd0..ef6e31b 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -87,8 +87,9 @@ virt-xml-validate.1: virt-xml-validate.in $(top_srcdir)/configure.ac
 		rm $(srcdir)/$@; exit 1; fi

 virt-pki-validate: virt-pki-validate.in Makefile
-	$(AM_V_GEN)sed -e 's|[ ]sysconfdir@|$(sysconfdir)|' < $< > $@ \
-	    || (rm $@ && exit 1) && chmod +x $@
+	$(AM_V_GEN)sed -e 's|[ ]sysconfdir@|$(sysconfdir)|g' \
+		       -e 's|[ ]VERSION@|$(VERSION)|g' \
+	  < $< > $@ || (rm $@ && exit 1) && chmod +x $@

 virt-pki-validate.1: virt-pki-validate.in $(top_srcdir)/configure.ac
 	$(AM_V_GEN)$(POD2MAN) --name VIRT-PKI-VALIDATE $< $(srcdir)/$@ \
diff --git a/tools/virt-pki-validate.in b/tools/virt-pki-validate.in
index 5d0453f..87fb230 100755
--- a/tools/virt-pki-validate.in
+++ b/tools/virt-pki-validate.in
@@ -22,6 +22,35 @@
 #
 # Daniel Veillard <veillard redhat com>
 #
+
+case $1 in
+case $1 in
+  -h | --h | --he | --hel | --help)
+    cat <<EOF
+Usage:
+  $0 [OPTION]
+
+Options:
+  -h | --help        Display program help
+  -V | --version     Display program version
+EOF
+    exit ;;
+  -V | --v | --ve | --ver | --vers | --versi | --versio | --version)
+    cat <<EOF
+$0 (libvirt) @VERSION@
+EOF
+    exit ;;
+  --) shift ;;
+  -*)
+    echo "$0: unrecognized option '$1'" >&2
+    exit 1 ;;
+esac
+
+if test $# != 0; then
+    echo "$0: unrecognized argument '$1'" >&2
+    exit 1 ;;
+fi
+
 USER=`who am i | awk '{ print $1 }'`
 SERVER=1
 CLIENT=1
@@ -300,7 +329,7 @@ exit 0

 =head1 SYNOPSIS

-  virt-pki-validate
+  virt-pki-validate [OPTION]

 =head1 DESCRIPTION

@@ -309,6 +338,20 @@ a secure libvirt server or client using the TLS encryption protocol.
 It will report any missing certificate or key files on the host. It
 should be run as root to ensure it can read all the necessary files

+=head1 OPTIONS
+
+=over
+
+=item B<-h, --help>
+
+Display command line help usage then exit.
+
+=item B<-V, --version>
+
+Display version information then exit.
+
+=back
+
 =head1 EXIT STATUS

 Upon successful validation, an exit status of 0 will be set. Upon
-- 
1.8.3.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]