Merge pull request #2090 from travis-ci/kw-jdk

JDK syntax fix

Author: smokodon

lib/travis/build/bash/travis_install_jdk.bash

@@ -56,15 +56,22 @@ travis_install_jdk_package_adoptopenjdk() {
       dpkg-query -l adoptopenjdk* | grep adoptopenjdk | awk '{print $2}' | xargs sudo dpkg -P
     fi
     if [[ "${TRAVIS_CPU_ARCH}" == "ppc64le" ]]; then
-      TRAVIS_CPU_ARCH="ppc64el"
+      wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add -
+      sudo add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
+      sudo apt-get update -yqq
+      sudo apt-get -yqq --no-install-suggests --no-install-recommends install "$PACKAGE" || true
+      travis_cmd "export JAVA_HOME=/usr/lib/jvm/adoptopenjdk-${JAVA_VERSION}-hotspot-ppc64el" --echo
+      travis_cmd "export PATH=$JAVA_HOME/bin:$PATH" --echo
+      sudo update-java-alternatives -s "$PACKAGE"*
+    else
+      wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add -
+      sudo add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
+      sudo apt-get update -yqq
+      sudo apt-get -yqq --no-install-suggests --no-install-recommends install "$PACKAGE" || true
+      travis_cmd "export JAVA_HOME=/usr/lib/jvm/adoptopenjdk-${JAVA_VERSION}-hotspot-${TRAVIS_CPU_ARCH}" --echo
+      travis_cmd "export PATH=$JAVA_HOME/bin:$PATH" --echo
+      sudo update-java-alternatives -s "$PACKAGE"*
     fi
-    wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add -
-    sudo add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
-    sudo apt-get update -yqq
-    sudo apt-get -yqq --no-install-suggests --no-install-recommends install "$PACKAGE" || true
-    travis_cmd "export JAVA_HOME=/usr/lib/jvm/adoptopenjdk-${JAVA_VERSION}-hotspot-${TRAVIS_CPU_ARCH}" --echo
-    travis_cmd "export PATH=$JAVA_HOME/bin:$PATH" --echo
-    sudo update-java-alternatives -s "$PACKAGE"*
   fi
 }
 
@@ -78,14 +85,21 @@ travis_install_jdk_package_bellsoft() {
   PACKAGE="bellsoft-java${JAVA_VERSION}"
   if ! dpkg -s "$PACKAGE" >/dev/null 2>&1; then
     if [[ "${TRAVIS_CPU_ARCH}" == "arm64" ]]; then
-      TRAVIS_CPU_ARCH="aarch64"
+      wget -qO - https://download.bell-sw.com/pki/GPG-KEY-bellsoft | sudo apt-key add -
+      sudo add-apt-repository "deb [arch=$TRAVIS_CPU_ARCH] https://apt.bell-sw.com/ stable main"
+      sudo apt-get update -yqq
+      sudo apt-get -yqq --no-install-suggests --no-install-recommends install "$PACKAGE" || true
+      travis_cmd "export JAVA_HOME=/usr/lib/jvm/bellsoft-java${JAVA_VERSION}-aarch64" --echo
+      travis_cmd "export PATH=$JAVA_HOME/bin:$PATH" --echo
+      sudo update-java-alternatives -s "$PACKAGE"*
+    else
+      wget -qO - https://download.bell-sw.com/pki/GPG-KEY-bellsoft | sudo apt-key add -
+      sudo add-apt-repository "deb [arch=$TRAVIS_CPU_ARCH] https://apt.bell-sw.com/ stable main"
+      sudo apt-get update -yqq
+      sudo apt-get -yqq --no-install-suggests --no-install-recommends install "$PACKAGE" || true
+      travis_cmd "export JAVA_HOME=/usr/lib/jvm/bellsoft-java${JAVA_VERSION}-${TRAVIS_CPU_ARCH}" --echo
+      travis_cmd "export PATH=$JAVA_HOME/bin:$PATH" --echo
+      sudo update-java-alternatives -s "$PACKAGE"*
     fi
-    wget -qO - https://download.bell-sw.com/pki/GPG-KEY-bellsoft | sudo apt-key add -
-    sudo add-apt-repository "deb [arch=$TRAVIS_CPU_ARCH] https://apt.bell-sw.com/ stable main"
-    sudo apt-get update -yqq
-    sudo apt-get -yqq --no-install-suggests --no-install-recommends install "$PACKAGE" || true
-    travis_cmd "export JAVA_HOME=/usr/lib/jvm/bellsoft-java${JAVA_VERSION}-${TRAVIS_CPU_ARCH}" --echo
-    travis_cmd "export PATH=$JAVA_HOME/bin:$PATH" --echo
-    sudo update-java-alternatives -s "$PACKAGE"*
   fi
 }