Changeset 323 for trunk/confadmin.in

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

File:

• trunk/confadmin.in (modified) (3 diffs, 1 prop)

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