summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2017-07-22 14:11:45 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2017-07-23 08:20:40 +0000
commit013dbbabfbc85128af4b030c2744ea55421c4cf1 (patch)
tree7d8c1f36293525d9c05893dc6e6a2b29c95b3328
parentAdding support for setup tarballs in curl container create script for applian... (diff)
downloadcompute-tools-013dbbabfbc85128af4b030c2744ea55421c4cf1.tar.xz
compute-tools-013dbbabfbc85128af4b030c2744ea55421c4cf1.zip
Sorting password option handling in curl container create script.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
-rwxr-xr-xshare/scripts/curl12
1 files changed, 6 insertions, 6 deletions
diff --git a/share/scripts/curl b/share/scripts/curl
index 8176991..3a715ca 100755
--- a/share/scripts/curl
+++ b/share/scripts/curl
@@ -26,7 +26,7 @@ CACHE="/var/cache/container-tools/images"
Parameters ()
{
- GETOPT_LONGOPTIONS="bind:,bind-ro:,script:,name:,clean,image:,server:,password:"
+ GETOPT_LONGOPTIONS="bind:,bind-ro:,script:,name:,clean,image:,password:,server:,"
GETOPT_OPTIONS="b:,s:,n:,p:"
PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${SCRIPT} --options ${GETOPT_OPTIONS} --shell sh -- ${@})"
@@ -82,13 +82,13 @@ Parameters ()
shift 2
;;
- --server)
- SERVER="${2}"
+ -p|--password)
+ PASSWORD="${2}"
shift 2
;;
- -p|--password)
- PASSWORD="${2}"
+ --server)
+ SERVER="${2}"
shift 2
;;
@@ -107,7 +107,7 @@ Parameters ()
Usage ()
{
- echo "Usage: container create -n|--name NAME -s|--script ${SCRIPT} -- [--clean] [--image IMAGE] [--server SERVER] [-p|--password PASSWORD}" >&2
+ echo "Usage: container create -n|--name NAME -s|--script ${SCRIPT} -- [--clean] [--image IMAGE] [-p|--password PASSWORD] [--server SERVER]" >&2
exit 1
}