Rearrange options. Improve layout of help text.

1 files changed, 22 insertions, 23 deletions

diff --git a/localezcreate b/localezcreate
index d06fb57..7e4c2e1 100755
--- a/localezcreate
+++ b/localezcreate
@@ -3,7 +3,7 @@
 # /usr/local/sbin/localezcreate
 # Copyright 2001-2002 Jonas Smedegaard <dr@jones.dk>
 #
-# $Id: localezcreate,v 1.13 2002-12-05 04:20:19 jonas Exp $
+# $Id: localezcreate,v 1.14 2002-12-05 04:41:24 jonas Exp $
 #
 # Create local eZ Publish site
 #
@@ -22,6 +22,7 @@ sqlfile2="data_mysql.sql"
 defaultmaildomain=`cat /etc/mailname 2> /dev/null || hostname -d`
 defaultdomain="ez."`hostname -d`
 defaultuid="www-data"
+defaultgid="www-data"
 dbserver="localhost"
 dballow="$dbserver"
 template_tarballs=""
@@ -31,32 +32,30 @@ if [ -e /etc/local/localezcreate.conf ]; then
 fi
 
 # Input
-dbuser="$1"
-host="$2"
+host="$1"
+uid="$2"
 fqdn="$3"
-dbname="$4"
-mailuser="$5"
-maildomain="$6"
-uid="$7"
+maildomain="$4"
+dbname="$5"
+dbuser="$6"
+mailuser="$7"
 gid="$8"
-dbpass="$9"
 
-
-if [ $# \< 2 -o $# \> 9 ]; then
-	echo "Usage: `basename $0` dbuser host [fqdn [dbname [mailuser [maildomain"
-	echo "                [ uid [ gid [dbpass ]]]]]]]"
+if [ $# \< 1 -o $# \> 8 ]; then
+	echo "Usage: `basename $0` host [ uid [ fqdn [ maildomain [ dbname [ dbuser"
+	echo "                [ mailuser [ gid ]]]]]]"
 	echo
-	echo "  dbuser:      MySQL database user"
-	echo "  host:        hostname (without domain - no dots!)"
-	echo "  fqdn:        Complete domain name (default: <host>.$defaultdomain)"
-	echo "  dbname:      MySQL database name (default: ez_2_2_<host>)"
-	echo "  mailuser:    User part of mail address (default: <dbuser>)"
-	echo "  maildomain:  Domain part of mail address (default: $defaultmaildomain)"
-	echo "  uid:         System user id (default: $defaultuid)"
-	echo "  gid:         System group id (default: <uid>"
-	echo "  dbpass:      MySQL password (default: attempt to resolve or ask)"
+	echo "  OPTION       DESCRIPTION                 DEFAULT VALUE"
+	echo "  host:        hostname (without domain)"
+	echo "  uid:         System user id              ($defaultuid)"
+	echo "  fqdn:        Complete domain name        (<host>.$defaultdomain)"
+	echo "  maildomain:  Domain part of mail address ($defaultmaildomain)"
+	echo "  dbname:      MySQL database name         (ez_2_2_<host>)"
+	echo "  dbuser:      MySQL database user         (<uid>)"
+	echo "  mailuser:    User part of mail address   (<dbuser>)"
+	echo "  gid:         System group id             ($defaultgid"
 	echo
-	echo "  dbpass resolving is done by looking in file $HOME/.my.cnf of <uid>."
+	echo "  MySQL password for <dbuser> can be stored in $HOME/.my.cnf of <uid>."
 	echo
 	echo "  Example: `basename $0` bilbo news news.forum.com"
 
@@ -81,7 +80,7 @@ if [ -z "$dbadmpass" ]; then
 fi
 
 uid=${uid:-$defaultuid}
-gid=${gid:-$uid}
+gid=${gid:-$defaultgid}
 fqdn=${fqdn:-$host.$defaultdomain}
 dbname=${dbname:-ez_2_2_$host}
 mailuser=${mailuser:-$uid}