Minecraft Java Server: add user error for 32bit java 21

Botspot · Jul 27, 2024 · 849f646 · 849f646
1 parent 363360d
commit 849f646
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/api b/api
@@ -945,7 +945,7 @@ rm_external_repo() { # remove an external apt repo and its gpg key, if the repo
 
 adoptium_installer() {
   case "$__os_codename" in
-  bionic | focal | jammy | buster | bullseye | bookworm)
+  bionic | focal | jammy | noble | buster | bullseye | bookworm)
     add_external_repo "adoptium" "https://adoptium.jfrog.io/artifactory/api/security/keypair/default-gpg-key/public" "https://adoptium.jfrog.io/artifactory/deb" "$__os_codename" "main" || exit 1
     ;;
   *)

diff --git a/apps/Minecraft Java Server/install b/apps/Minecraft Java Server/install
@@ -147,7 +147,17 @@ fi
 install_packages lsb-release wget gpg screen || exit 1
 
 case "$java_selection" in
-  "Java 8"|"Java 17"|"Java 21")
+  "Java 21")
+    case "$arch" in
+      "32")
+        error "User error: Java 21 is not available for your platform from Adoptium. All 32-bit based architectures are being deprecated and removed by Java. Please use a 64-bit OS. Exiting the script."
+        ;;
+      *)
+        adoptium_installer || exit 1
+        ;;
+    esac
+    ;;
+  "Java 8"|"Java 17")
     adoptium_installer || exit 1
     ;;
   *)