summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjoranv <gjoranv@gmail.com>2018-11-05 14:56:02 +0100
committerGitHub <noreply@github.com>2018-11-05 14:56:02 +0100
commitb045638010b7aa3c8fb9b3ea8f127ca4246e8740 (patch)
treed72bbe8f3765162db3e31a6a06efdb54acf74c09
parent224530764a1f971673a4d4a0239928379b170cea (diff)
parent0b78261d5f03661734e7d0c202f12d843e69f28d (diff)
Merge pull request #7566 from vespa-engine/gjoranv/add-maven-env-vars
Add optional env vars for maven command and extra opts.
-rwxr-xr-xbootstrap.sh18
1 files changed, 17 insertions, 1 deletions
diff --git a/bootstrap.sh b/bootstrap.sh
index 6cdcc17400c..c8f300408db 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 [[ -n $existing_value ]]; then
+ echo "$existing_value"
+ elif [[ -n $default_val ]]; 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