Fix Option for AdoptOpenJDK (openhab#907)

Signed-off-by: Ethan Dye <[email protected]>
ecdye · May 21, 2020 · 629d31b · 629d31b
1 parent 48a4745
commit 629d31b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/build-image/openhabian.conf b/build-image/openhabian.conf
@@ -39,6 +39,6 @@ debugmode=on
 
 # Java architecture mode
 # Valid arguments: "AdoptOpenJDK", "Zulu32", or "Zulu64"
-java_arch=32-bit
+java_opt=Zulu32
 
 # vim: filetype=sh
diff --git a/build-image/openhabian.pi-raspbian.conf b/build-image/openhabian.pi-raspbian.conf
@@ -39,6 +39,6 @@ debugmode=none
 
 # Java architecture mode
 # Valid arguments: "AdoptOpenJDK", "Zulu32", or "Zulu64"
-java_arch=32-bit
+java_opt=Zulu32
 
 # vim: filetype=sh
diff --git a/functions/menu.bash b/functions/menu.bash
@@ -182,9 +182,9 @@ show_main_menu() {
   elif [[ "$choice" == "60"* ]]; then
     choosenComponents=$(whiptail --title "Manual/Fresh Setup" --checklist "Choose which system components to install or configure:" 20 116 13 --cancel-button Back --ok-button Execute \
     "62 | Packages"               "Install needed and recommended system packages " OFF \
-    "63 | Zulu OpenJDK 32-bit"    "Install Zulu 32-bit OpenJDK as primary Java provider" \
-    "   | Zulu OpenJDK 64-bit"    "Install Zulu 64-bit OpenJDK as primary Java provider" \
-    "   | AdoptOpenJDK"           "Install AdoptOpenJDK as primary Java provider" \
+    "63 | Zulu OpenJDK 32-bit"    "Install Zulu 32-bit OpenJDK as primary Java provider" OFF \
+    "   | Zulu OpenJDK 64-bit"    "Install Zulu 64-bit OpenJDK as primary Java provider" OFF \
+    "   | AdoptOpenJDK"           "Install AdoptOpenJDK as primary Java provider" OFF \
     "64 | openHAB stable"         "Install the latest openHAB release" OFF \
     "   | openHAB testing"        "Install the latest openHAB testing (milestone) build" OFF \
     "   | openHAB unstable"       "(Alternative) Install the latest openHAB SNAPSHOT build" OFF \

diff --git a/openhabian.conf.dist b/openhabian.conf.dist
@@ -38,6 +38,6 @@ debugmode=on
 
 # Java architecture mode
 # Valid arguments: "AdoptOpenJDK", "Zulu32", or "Zulu64"
-java_arch=32-bit
+java_opt=Zulu32
 
 # vim: filetype=sh