richard: server/kolabd/kolabd ChangeLog, 1.274, 1.275 kolab_ca.sh.in, 1.4, 1.5

[cvs at kolab.org]

Author: richard

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv4921

Modified Files:
	ChangeLog kolab_ca.sh.in 
Log Message:
better usage output. kolab/issue3979



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -d -r1.274 -r1.275
--- ChangeLog	13 Dec 2009 18:04:37 -0000	1.274
+++ ChangeLog	19 Dec 2009 11:50:01 -0000	1.275
@@ -1,16 +1,20 @@
-2009-12-02  Mathieu Parent <math.parent at gmail.com>
+2009-12-19 Richard Bos <richard at radoeka.nl>
+
+	* kolab_ca.sh.in: better usage output. kolab/issue3979 
+
+2009-12-13  Mathieu Parent <math.parent at gmail.com>
 
 	* templates/*.template.in: Use @@@warning@@@ macro, improving the
-      warning about kolab templates within configuration files
-      (kolab/issue1671).
+	  warning about kolab templates within configuration files
+	  (kolab/issue1671).
 
 2009-12-13  Mathieu Parent <math.parent at gmail.com>
 
 	* templates/{DB_CONFIG.slapd,imapd.group,slapd.access,slapd.conf,
-      slapd.replicas,transport,virtual}.template.in: use the new
-      @@@print@@@ macro (perl-kolab) to behave like other templates
-      (solved kolab/issue1740).
-      Use RUNONCHANGE for OpenLDAP configuration files.
+	  slapd.replicas,transport,virtual}.template.in: use the new
+	  @@@print@@@ macro (perl-kolab) to behave like other templates
+	  (solved kolab/issue1740).
+	  Use RUNONCHANGE for OpenLDAP configuration files.
 
 2009-12-02  Mathieu Parent <math.parent at gmail.com>
 

Index: kolab_ca.sh.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_ca.sh.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kolab_ca.sh.in	27 Nov 2009 19:16:12 -0000	1.4
+++ kolab_ca.sh.in	19 Dec 2009 11:50:01 -0000	1.5
@@ -148,11 +148,25 @@
     fi
 }
 
-appname=$0
+function usage() {
+    echo "Usage:"
+    echo "       $appname -newca hostname [organization organizational-unit]"
+    echo "       $appname -newreq hostname [keyfile] [certfile]"
+    echo "       $appname -sign [filename]"
+    echo "       $appname -verify [filename]"
+    echo
+    echo "       -h|--help: this help text"
+    exit 0
+}
+
+appname=$(basename $0)
+
+[[ $# == 0 ]] && usage
+
 while [ $# -gt 0 ]; do
 case $1 in
 -h|-help|--help)
-    echo "Usage: $appname {-newca hostname [organization organizational-unit]|-newreq hostname [keyfile] [certfile]|-sign [filename]|-verify [filename]|-help}"
+    usage
     ;;
 -newca)
     if [ ! -f ${CATOP}/serial ]; then