! improve scripts

scripts/codecov.sh

@@ -6,6 +6,6 @@ source ./prepare-jdk.sh
 source ./common_build.sh
 
 switch_to_jdk 8
-runCmd ./mvnw clean -V
-runCmd ./mvnw cobertura:cobertura
+runCmd "${MVN_CMD[@]}" clean
+runCmd "${MVN_CMD[@]}" cobertura:cobertura
 runCmd codecov

scripts/common_build.sh

@@ -39,7 +39,7 @@ readonly -a JAVA_CMD=(
     }
 )
 readonly -a MVN_CMD=(
-    ./mvnw -V
+    ./mvnw -V --no-transfer-progress
 )
 
 #################################################################################

scripts/integration-test.sh

@@ -18,11 +18,7 @@ runCmd ./scripts/run-agent-test.sh "${1:-}"
 for jhm_var_name in "${java_home_var_names[@]}"; do
     export JAVA_HOME="${!jhm_var_name}"
 
-    if [ -n "$JAVA_HOME" ]; then
-        headInfo "test with $jhm_var_name: $JAVA_HOME"
-        runCmd ./scripts/run-junit.sh skipClean
-        runCmd ./scripts/run-agent-test.sh skipClean
-    else
-        headInfo "skip $jhm_var_name: $JAVA_HOME"
-    fi
+    headInfo "test with $jhm_var_name: $JAVA_HOME"
+    runCmd ./scripts/run-junit.sh skipClean
+    runCmd ./scripts/run-agent-test.sh skipClean
 done

scripts/prepare-jdk.sh

@@ -40,7 +40,7 @@ jdks_install_by_sdkman=(
 )
 java_home_var_names=()
 
-exportJdkVarAndInstall() {
+setJdkHomeVarsAndInstallJdk() {
     JDK6_HOME="${JDK6_HOME:-/usr/lib/jvm/java-6-openjdk-amd64}"
     java_home_var_names=(JDK6_HOME)
 
@@ -50,7 +50,7 @@ exportJdkVarAndInstall() {
         local jdkNameOfSdkman="${jdks_install_by_sdkman[i]}"
         local jdkHomePath="$SDKMAN_CANDIDATES_DIR/java/$jdkNameOfSdkman"
 
-        # export JDK7_HOME ~ JDK1x_HOME
+        # set JDK7_HOME ~ JDK1x_HOME to global var java_home_var_names
         local jdkHomeVarName="JDK${jdkVersion}_HOME"
         eval "$jdkHomeVarName='${jdkHomePath}'"
         java_home_var_names=("${java_home_var_names[@]}" "$jdkHomeVarName")
@@ -66,11 +66,11 @@ exportJdkVarAndInstall() {
     echo "prepare jdks: ${java_home_var_names[*]}"
     ls -la "$SDKMAN_CANDIDATES_DIR/java/"
 }
-exportJdkVarAndInstall
+setJdkHomeVarsAndInstallJdk
 
 
 switch_to_jdk() {
-    [ $# == 1 ] || die "switch_to_jdk need 1 argument! But provided: $*"
+    [ $# == 1 ] || die "${FUNCNAME[0]} need 1 argument! But provided: $*"
 
     local javaHomeVarName="JDK${1}_HOME"
     export JAVA_HOME="${!javaHomeVarName}"