Changeset 388

Timestamp:

07/04/2009 17:22:09 (3 years ago)

Author:

ccowart

Message:

Version output is now supported.

Fixes #27

Location:

trunk

Files:

• Makefile.am (modified) (2 diffs, 1 prop)
• configure.ac (modified) (1 prop)
• confman.8.in (modified) (1 diff)
• confman.in (modified) (2 diffs)
• confmanlib.sh.in (modified) (1 diff)

trunk/Makefile.am

@@ -1 +1 @@
 BASH = @BASH_SHELL@
+
+VERSION += ($$Rev$$)
 
 bashcompdir = $(sysconfdir)/bash_completion.d
@@ -53 +55 @@
                 -e 's,[@]SUDO[@],$(SUDO),g' \
                 -e 's,[@]SVN[@],$(SVN),g' \
-                -e 's,[@]GREADLINK[@],$(GREADLINK),g'
+                -e 's,[@]GREADLINK[@],$(GREADLINK),g' \
+                -e 's,[@]VERSION[@],$(VERSION),g' 
 
 confman: confman.in Makefile

trunk/confman.8.in

@@ -34 +34 @@
 .Nm
 .Op Fl h | Cm help
+.Op Fl v | Cm version
 .Nm
 .Ar command Oo Ar command_opts Oc Op Ar command_args

trunk/confman.in

@@ -975 +975 @@
 }
 
+function print_version {
+    echo "confman-${VERSION}"
+}
+
 # Debug mode?
-while getopts "hd-" opt ; do
+while getopts "hdv-" opt ; do
         case $opt in
                 d) DEBUG="true" ; shift ;;
         h) shift ; print_help "$@" ; exit 0 ;;
+        v) print_version ; exit 0 ;;
                 *) print_usage 1 ;;
         esac
@@ -991 +996 @@
 case $subcommand in
     help )                          print_help "$@" ; trap EXIT; exit 0 ;;
+    version )                       print_version; trap EXIT; exit 0;;
     setup|se* )                     setup "$@" ;;
     status )                        status "$@" ;;

trunk/confmanlib.sh.in

@@ -32 +32 @@
 WCOPY_DIRTY="false"
 
-VERSION="1.9.a"
+VERSION='@VERSION@'
 REPO_VERSION="2"