From: Robin Sheat <robin@catalyst.net.nz>
Date: Thu, 21 Jul 2011 05:32:09 +0000 (+1200)
Subject: Bug 6540 - [SIGNED-OFF] fix some command-line args issues
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=e7cf2223e06d9aea07f2dce6cd6481cbc2ae0d9d;p=koha.git

Bug 6540 - [SIGNED-OFF] fix some command-line args issues

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---

diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create
index 5c742e1d5e..d039e94ca0 100755
--- a/debian/scripts/koha-create
+++ b/debian/scripts/koha-create
@@ -20,9 +20,10 @@
 set -e
 
 usage="Usage: $0 [--create-db|--request-db|--populate-db] \
-[--marcflavor marc21|normarc|unimarc] \
-[--zebralang en|fr|nb] [--defaultsql /path/to/some.sql] 
-[--configfile /path/to/config] instancename"
+    [--marcflavor marc21|normarc|unimarc] \
+    [--zebralang en|nb|fr] \
+    [--defaultsql /path/to/some.sql] \
+    [--configfile /path/to/config] instancename"
 
 die() {
     echo "$@" 1>&2
@@ -78,7 +79,7 @@ fi
 
 [ $# -ge 2 ] && [ $# -le 10 ] || die $usage
 
-TEMP=`getopt -o crpm:l: -l create-db,request-db,populate-db,marcflavor:,zebralang:,configfile: \
+TEMP=`getopt -o crpm:l:d:f: -l create-db,request-db,populate-db,marcflavor:,zebralang:,defaultsql:,configfile: \
      -n "$0" -- "$@"`
 
 # Note the quotes around `$TEMP': they are essential!
@@ -99,7 +100,7 @@ while true ; do
 		-d|--defaultsql) CLO_DEFAULTSQL="$2" ; shift 2 ;;
 		-f|--configfile) configfile="$2" ; shift 2 ;;
 		--) shift ; break ;;
-		*) die $usage ;;
+		*) die "Internal error processing command line arguments" ;;
 	esac
 done