From a8cc3048439a6c9d71767dc608fc2541dc954cec Mon Sep 17 00:00:00 2001
From: gjoranv <gv@oath.com>
Date: Mon, 5 Nov 2018 13:15:34 +0100
Subject: Add optional env vars for maven command and extra opts.

---
 bootstrap.sh | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 6cdcc17400c..0f3faa63386 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -25,8 +25,24 @@ else
     exit 1
 fi
 
+get_env_var_with_optional_default() {
+   local var_name=$1
+   local default_val=$2
+   eval "existing_value=\${$var_name}"
+    if [ "$existing_value" ]; then
+        echo "$existing_value"
+    elif [ $# -ge 2 ]; then
+        echo "$default_val"
+    fi
+}
+
+readonly MAVEN_CMD=$(get_env_var_with_optional_default VESPA_MAVEN_COMMAND mvn)
+readonly MAVEN_EXTRA_OPTS=$(get_env_var_with_optional_default VESPA_MAVEN_EXTRA_OPTS)
+echo "Using maven command: ${MAVEN_CMD}"
+echo "Using maven extra opts: ${MAVEN_EXTRA_OPTS}"
+
 mvn_install() {
-    mvn --quiet --batch-mode --no-snapshot-updates clean install -Dmaven.javadoc.skip=true "$@"
+    ${MAVEN_CMD} --quiet --batch-mode --no-snapshot-updates clean install -Dmaven.javadoc.skip=true ${MAVEN_EXTRA_OPTS} "$@"
 }
 
 # Generate vtag map
-- 
cgit v1.2.3


From a3a8c8277ca44ee1bfe4bd13900d3e99d52764c1 Mon Sep 17 00:00:00 2001
From: Arnstein Ressem <aressem@gmail.com>
Date: Mon, 5 Nov 2018 13:25:11 +0100
Subject: Use '-n' to check for non-empty value

Co-Authored-By: gjoranv <gjoranv@gmail.com>
---
 bootstrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 0f3faa63386..2353154da8d 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -29,7 +29,7 @@ get_env_var_with_optional_default() {
    local var_name=$1
    local default_val=$2
    eval "existing_value=\${$var_name}"
-    if [ "$existing_value" ]; then
+    if [ -n "$existing_value" ]; then
         echo "$existing_value"
     elif [ $# -ge 2 ]; then
         echo "$default_val"
-- 
cgit v1.2.3


From 0b78261d5f03661734e7d0c202f12d843e69f28d Mon Sep 17 00:00:00 2001
From: gjoranv <gv@oath.com>
Date: Mon, 5 Nov 2018 14:24:23 +0100
Subject: Check for existence of correct variable.

+ Use bash double brackets
---
 bootstrap.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 2353154da8d..c8f300408db 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -29,9 +29,9 @@ get_env_var_with_optional_default() {
    local var_name=$1
    local default_val=$2
    eval "existing_value=\${$var_name}"
-    if [ -n "$existing_value" ]; then
+    if [[ -n $existing_value ]]; then
         echo "$existing_value"
-    elif [ $# -ge 2 ]; then
+    elif [[ -n $default_val ]]; then
         echo "$default_val"
     fi
 }
-- 
cgit v1.2.3