From 3acac4b5fa71321eb5b35afa8bda8d3cf7f096ed Mon Sep 17 00:00:00 2001 From: Philippe Lafoucrière Date: Sat, 11 Jan 2020 00:41:53 +0000 Subject: DRY java version code --- run.sh | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/run.sh b/run.sh index 987258a..6a0b8db 100755 --- a/run.sh +++ b/run.sh @@ -161,23 +161,19 @@ case "$COMMAND" in fi fi + if [[ ${LM_JAVA_VERSION} = "11" ]]; then + JAVA_HOME=/usr/lib/jvm/adoptopen_jdk11 + elif [[ ${LM_JAVA_VERSION} = "8" ]]; then + JAVA_HOME=/usr/lib/jvm/oracle_jdk8 + fi + if test -f pom.xml ; then # Install Java Maven dependencies. - if [[ ${LM_JAVA_VERSION} = "11" ]]; then - JAVA_HOME=/usr/lib/jvm/adoptopen_jdk11 - elif [[ ${LM_JAVA_VERSION} = "8" ]]; then - JAVA_HOME=/usr/lib/jvm/oracle_jdk8 - fi mvn install ${MAVEN_CLI_OPTS:--DskipTests} skip_prepare=true fi if test -f build.gradle ; then - if [[ ${LM_JAVA_VERSION} = "11" ]]; then - JAVA_HOME=/usr/lib/jvm/adoptopen_jdk11 - elif [[ ${LM_JAVA_VERSION} = "8" ]]; then - JAVA_HOME=/usr/lib/jvm/oracle_jdk8 - fi gradle build ${GRADLE_CLI_OPTS:-x test} skip_prepare=true fi -- cgit v1.2.3