Add Option for AdoptOpenJDK

Fixes openhab#868 See Also openhab#629 Signed-off-by: Ethan Dye <[email protected]>
ecdye · May 26, 2020 · ce18f1f · ce18f1f
1 parent 629d31b
commit ce18f1f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/functions/java-jre.bash b/functions/java-jre.bash
@@ -129,7 +129,7 @@ java_zulu_8_tar(){
 ## (package manager distributions only available on x86-64bit platforms when checked in April 2020)
 ##
 java_zulu_enterprise_8_apt(){
-  if ! dpkg -s 'zulu-8' >/dev/null 2>&1; then # Check if already is installed
+  if ! dpkg -s 'zulu-8' > /dev/null 2>&1; then # Check if already is installed
   echo -n "$(timestamp) [openHABian] Adding Zulu keys to apt... "
   cond_redirect apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 219BD9C9
   if [ $? -ne 0 ]; then echo "FAILED (keyserver)"; exit 1; fi

diff --git a/functions/menu.bash b/functions/menu.bash
@@ -158,9 +158,9 @@ show_main_menu() {
       43\ *) nginx_setup ;;
       *Delay\ rules\ load) delayed_rules yes;;
       *Default\ order) delayed_rules no;;
-      *Zulu\ OpenJDK\ 32-bit) update_config_java "Zulu32" && java_install_or_update "$java_opt";;
-      *Zulu\ OpenJDK\ 64-bit) update_config_java "Zulu64" && java_install_or_update "$java_opt";;
-      *AdoptOpenJDK) update_config_java "AdoptOpenJDK" && java_install_or_update "$java_opt";;
+      *Zulu\ OpenJDK\ 32-bit) update_config_java "Zulu32" && java_install_or_update "Zulu32";;
+      *Zulu\ OpenJDK\ 64-bit) update_config_java "Zulu64" && java_install_or_update "Zulu64";;
+      *AdoptOpenJDK) update_config_java "AdoptOpenJDK" && java_install_or_update "AdoptOpenJDK";;
       "") return 0 ;;
       *) whiptail --msgbox "A not supported option was selected (probably a programming error):\\n  \"$choice2\"" 8 80 ;;
     esac
@@ -200,9 +200,9 @@ show_main_menu() {
     wait_for_apt_to_finish_update
     if [[ $choosenComponents == *"62"* ]]; then apt-get upgrade -y && basic_packages && needed_packages; fi
     # shellcheck disable=SC2154
-    if [[ $choosenComponents == *"Zulu OpenJDK 32-bit"* ]]; then update_config_java "Zulu32" && java_install_or_update "$java_opt"; fi
-    if [[ $choosenComponents == *"Zulu OpenJDK 64-bit"* ]]; then update_config_java "Zulu64" && java_install_or_update "$java_opt"; fi
-    if [[ $choosenComponents == *"AdoptOpenJDK"* ]]; then update_config_java "AdoptOpenJDK" && java_install_or_update "$java_opt"; fi
+    if [[ $choosenComponents == *"Zulu OpenJDK 32-bit"* ]]; then update_config_java "Zulu32" && java_install_or_update "Zulu32"; fi
+    if [[ $choosenComponents == *"Zulu OpenJDK 64-bit"* ]]; then update_config_java "Zulu64" && java_install_or_update "Zulu64"; fi
+    if [[ $choosenComponents == *"AdoptOpenJDK"* ]]; then update_config_java "AdoptOpenJDK" && java_install_or_update "AdoptOpenJDK"; fi
     if [[ $choosenComponents == *"64"* ]]; then openhab2_setup; fi
     if [[ $choosenComponents == *"openHAB testing"* ]]; then openhab2_setup testing; fi
     if [[ $choosenComponents == *"openHAB unstable"* ]]; then openhab2_setup unstable; fi