From f0aa086690e6fd31bbf24d989f90674533cdcebe Mon Sep 17 00:00:00 2001 From: Ethan Dye Date: Wed, 8 Jul 2020 14:37:05 -0600 Subject: [PATCH] Fix check for Java arch when updating Zulu Fixes #1013 Signed-off-by: Ethan Dye --- functions/java-jre.bash | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/functions/java-jre.bash b/functions/java-jre.bash index 8f24e9803..3362f87f1 100644 --- a/functions/java-jre.bash +++ b/functions/java-jre.bash @@ -346,10 +346,10 @@ java_zulu_update_available() { fi if [[ -z $requestedArch ]] || [[ -z $availableVersion ]]; then echo "FAILED (java update available)"; return 1; fi - if [[ "$("${jdkBin}"/java -version 2>&1 > /dev/null)" == *"aarch32hf"* ]]; then javaArch="aarch32hf"; fi - if [[ "$("${jdkBin}"/java -version 2>&1 > /dev/null)" == *"i686"* ]]; then javaArch="i686"; fi - if [[ "$("${jdkBin}"/java -version 2>&1 > /dev/null)" == *"aarch64"* ]]; then javaArch="aarch64"; fi - if [[ "$("${jdkBin}"/java -version 2>&1 > /dev/null)" == *"x64"* ]]; then javaArch="x64"; fi + if [[ $jdkBin == *"aarch32hf"* ]]; then javaArch="aarch32hf"; fi + if [[ $jdkBin == *"i686"* ]]; then javaArch="i686"; fi + if [[ $jdkBin == *"aarch64"* ]]; then javaArch="aarch64"; fi + if [[ $jdkBin == *"x64"* ]]; then javaArch="x64"; fi if [[ $javaVersion == "$availableVersion" ]] && [[ $javaArch == "$requestedArch" ]]; then return 1 # Java is up-to-date