summaryrefslogtreecommitdiff
path: root/run.sh
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2020-06-29 15:06:01 +0000
committermo khan <mo.khan@gmail.com>2020-06-29 15:06:01 +0000
commit2b8b49ae9fcd960beb0c639f241ce20690e7c7b0 (patch)
tree8eb4c449f31f531df7a846ff395a134f500ff230 /run.sh
parentab58b999d38094e6c2ec076856bba0e06ee23e92 (diff)
parent4893f1b996fb7806761fe9baa518fc17da7b2cea (diff)
Merge branch 'update-java' into 'master'v3.12.3
Update Java to match new naming convention See merge request gitlab-org/security-products/license-management!176
Diffstat (limited to 'run.sh')
-rwxr-xr-xrun.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/run.sh b/run.sh
index 524371f..97207a6 100755
--- a/run.sh
+++ b/run.sh
@@ -63,11 +63,11 @@ function prepare_dotnet() {
function prepare_java() {
if [ -n "$LM_JAVA_VERSION" ]; then
- switch_to java "adopt-openjdk-${LM_JAVA_VERSION}"
+ switch_to java "adoptopenjdk-${LM_JAVA_VERSION}"
elif [ -n "$ASDF_JAVA_VERSION" ]; then
- switch_to_exact java "$ASDF_JAVA_VERSION"
+ switch_to_exact java "${ASDF_JAVA_VERSION//adopt-openjdk/adoptopenjdk}"
else
- switch_to java "adopt-openjdk-8"
+ switch_to java "adoptopenjdk-8"
fi
}