diff --git a/ci/install-openjdk.bash b/ci/install-openjdk.bash index 211827189..1537efd34 100644 --- a/ci/install-openjdk.bash +++ b/ci/install-openjdk.bash @@ -149,7 +149,7 @@ function determine_openjdk() { esac ;; *) - echo No known dist for $(uname) + echo No known dist for ${uname} esac } @@ -163,7 +163,7 @@ function download_and_extract() { popd } -function add_jdk() { +function add_jdk_to_jenv() { echo $dist echo $tmpdir case $(uname) in @@ -178,8 +178,8 @@ function add_jdk() { determine_openjdk download_and_extract -add_jdk +add_jdk_to_jenv -. ${DIR}/set-jdk.bash ${jdk} +. ${DIR}/set-jdk.bash ${jdk} ${ABCL_ROOT} jenv doctor diff --git a/ci/set-jdk.bash b/ci/set-jdk.bash index 06ef0df8f..8df1fdace 100644 --- a/ci/set-jdk.bash +++ b/ci/set-jdk.bash @@ -66,3 +66,4 @@ function set_jdk() { popd } +set_jdk ${JDK_VERSION} ${ABCL_VERSION}