Changeset 323

Timestamp:

05/03/2009 16:25:09 (3 years ago)

Author:

ccowart

Message:

Refactored sourcing of the documentation library to support the confadmin
utility. Cleaned up handling of -h for these scripts.

Also set the keywords property on source files that were missing it.

Fixes #20

Location:

trunk

Files:

• Makefile.am (modified) (1 diff, 1 prop)
• confadmin.8 (modified) (2 diffs, 1 prop)
• confadmin.in (modified) (3 diffs, 1 prop)
• confadmindoc.sh (added)
• confaudit.8 (modified) (1 diff, 1 prop)
• confexport.8 (modified) (1 diff, 1 prop)
• configure.ac (modified) (1 prop)
• confman.8.in (modified) (2 diffs, 1 prop)
• confman.conf.5.in (modified) (1 diff, 1 prop)
• confman.conf.in (modified) (1 diff)
• confman.in (modified) (2 diffs)
• confmancommon.sh.in (modified) (1 diff)
• confmandoc.sh (modified) (1 diff)
• confsync.8 (modified) (1 diff, 1 prop)

trunk/Makefile.am

@@ -7 +7 @@
 dist_pkglibexec_SCRIPTS = conflock abspath
 pkgdata_SCRIPTS = confmancommon.sh
-dist_pkgdata_SCRIPTS = confmanlib.sh confmandoc.sh
+dist_pkgdata_SCRIPTS = confmanlib.sh confmandoc.sh confadmindoc.sh
 sysconf_DATA = confman.conf.sample
 sysconfdefaults_DATA = confman.conf

trunk/confadmin.8

@@ -23 +23 @@
 .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $Id: confman 278 2009-01-18 03:33:03Z ccowart $
+.\" $Id$
 .\"
 .Dd January 17, 2008
@@ -33 +33 @@
 .Sh SYNOPSIS
 .Nm
-.Op Fl h | -help | Cm help
+.Op Fl h | Cm help
 .Nm
 .Ar command 

trunk/confadmin.in

@@ -25 +25 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $Id: confman.in 308 2009-01-27 07:01:40Z ccowart $
+# $Id$
 #
 
@@ -32 +32 @@
 else
     echo "Can't find confmancommon.sh. Exiting." >&2
+fi
+
+# Source the documentation library
+if [ -f $REPO_DOCS_CONFADMIN ] ; then
+        . $REPO_DOCS_CONFADMIN
+else
+    echo "Couldn't source the confman shell documentation library" >&2
+        exit 1
 fi
 
@@ -55 +63 @@
 
 # Debug mode?
-while getopts "d" opt ; do
+while getopts "hd" opt ; do
         case $opt in
-                d)
-                DEBUG="true"
-                shift
-                ;;
-                *)
-                print_help 1
-                ;;
+                d) DEBUG="true" ;;
+        h) shift ; print_help "$@" ; exit 0 ;;
+                *) print_usage 1 ;;
         esac
 done

trunk/confaudit.8

@@ -23 +23 @@
 .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $Id: confman 278 2009-01-18 03:33:03Z ccowart $
+.\" $Id$
 .\"
 .Dd January 17, 2008

trunk/confexport.8

@@ -23 +23 @@
 .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $Id: confman 278 2009-01-18 03:33:03Z ccowart $
+.\" $Id$
 .\"
 .Dd January 17, 2008

trunk/confman.8.in

@@ -23 +23 @@
 .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $Id: confman 278 2009-01-18 03:33:03Z ccowart $
+.\" $Id$
 .\"
 .Dd January 17, 2008
@@ -33 +33 @@
 .Sh SYNOPSIS
 .Nm
-.Op Fl h | -help | Cm help
+.Op Fl h | Cm help
 .Nm
 .Ar command Oo Ar command_opts Oc Op Ar command_args

trunk/confman.conf.5.in

@@ -23 +23 @@
 .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $Id: confman 278 2009-01-18 03:33:03Z ccowart $
+.\" $Id$
 .\"
 .Dd January 17, 2008

trunk/confman.conf.in

@@ -16 +16 @@
 
 # The location of our shell's documentation library
-REPO_DOCS="@pkgdatadir@/confmandoc.sh"
+REPO_DOCS_CONFMAN="@pkgdatadir@/confmandoc.sh"
+REPO_DOCS_CONFADMIN="@pkgdatadir@/confadmindoc.sh"
 
 # The system lockfile

trunk/confman.in

@@ -34 +34 @@
 else
     echo "Can't find confmancommon.sh. Exiting." >&2
+fi
+
+# Source the documentation library
+if [ -f $REPO_DOCS_CONFMAN ] ; then
+        . $REPO_DOCS_CONFMAN
+else
+    echo "Couldn't source the confman shell documentation library" >&2
+        exit 1
 fi
 
@@ -937 +945 @@
 
 # Debug mode?
-while getopts "d" opt ; do
+while getopts "hd-" opt ; do
         case $opt in
-                d)
-                DEBUG="true"
-                shift
-                ;;
-                *)
-                print_help 1
-                ;;
+                d) DEBUG="true" ;;
+        h) shift ; print_help "$@" ; exit 0 ;;
+                *) print_usage 1 ;;
         esac
 done

trunk/confmancommon.sh.in

@@ -140 +140 @@
 fi
 
-# And the documentation library
-if [ -f $REPO_DOCS ] ; then
-        . $REPO_DOCS
-else
-    echo "Couldn't source the confman shell documentation library" >&2
-        exit 1
-fi
-
 # And we'll set a trap:
 trap "conf_cleanExit" SIGINT SIGTERM SIGHUP

trunk/confmandoc.sh

@@ -34 +34 @@
 
 Usage:
-  $MYNAME [ help | -h | --help ] [ command ]
+  $MYNAME [ help | -h ] [ command ]
   $MYNAME setup
   $MYNAME update

trunk/confsync.8

@@ -23 +23 @@
 .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $Id: confman 278 2009-01-18 03:33:03Z ccowart $
+.\" $Id$
 .\"
 .Dd January 17, 2008