summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Kulhavy <martin.kulhavy@nokia.com>2017-08-18 17:43:49 +0300
committerMartin Kulhavy <martin.kulhavy@nokia.com>2017-08-18 17:43:49 +0300
commit31d78619092ba930f94f19599a677842ca66d216 (patch)
treef6ba6255388d75522776d273f94f552cdb78677c
parentf396b9912eb0f0c39aa72021d8ec4b8caf340bf2 (diff)
Move help usage information to beginning of script
If user requests the usage information (e.g. with `--help` argument), the information should be displayed right away. Currently the script first runs updates and installs of dependencies, which can take very long time. Change-Id: If5a75a98876ddeeb580764d823a11331ee8e9faf Signed-off-by: Martin Kulhavy <martin.kulhavy@nokia.com>
-rwxr-xr-xci/03-maasdeploy.sh34
1 files changed, 18 insertions, 16 deletions
diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index db60bbfc..fb599e68 100755
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -4,6 +4,24 @@ set -ex
source tools.sh
+
+usage() {
+ # no xtrace output
+ { set +x; } 2> /dev/null
+
+ echo "OPNFV JOID deployer of the MAAS (Metal as a Service) infrastructure."
+ echo "Usage: $0 custom <path_to_labconfig>"
+ echo " $0 virtual"
+ exit ${1-0}
+}
+
+# Print usage help message if requested
+if [ "$1" == "help" ] || [ "$1" == "-h" ] || [ "$1" == "--help" ]
+then
+ usage;
+fi
+
+
virtinstall=0
labname=$1
@@ -45,22 +63,6 @@ sudo apt-get install bridge-utils openssh-server bzr git virtinst qemu-kvm libvi
sudo -H pip install --upgrade pip
-usage() {
- # no xtrace output
- { set +x; } 2> /dev/null
-
- echo "OPNFV JOID deployer of the MAAS (Metal as a Service) infrastructure."
- echo "Usage: $0 custom <path_to_labconfig>"
- echo " $0 virtual"
- exit ${1-0}
-}
-
-if [ "$1" == "help" ] || [ "$1" == "-h" ] || [ "$1" == "--help" ]
-then
- usage;
-fi
-
-
#
# Config preparation
#