From 3106811c5ed01a8e8637f3ded1e22e9d719a22c8 Mon Sep 17 00:00:00 2001
From: fithwum <fithwum@hotmail.com>
Date: Mon, 20 Jul 2026 07:28:40 -0700
Subject: [PATCH] java fixes

---
 minecraft/install_script.sh | 16 ++++++++--------
 testing/install_script.sh   | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/minecraft/install_script.sh b/minecraft/install_script.sh
index fd829be..d226aeb 100644
--- a/minecraft/install_script.sh
+++ b/minecraft/install_script.sh
@@ -18,29 +18,29 @@ NEOFORGED_INSTALLER_FILE=https://maven.neoforged.net/releases/net/neoforged/neof
 # Install java
 if [ $JAVA_VERSION = "openjdk-21-jre" ]; then
     echo "INFO ! $JAVA_VERSION Selected"
-	if dpkg -s $JAVA_VERSION &> /dev/null
+	if dpkg -s openjdk-21-jre-headless &> /dev/null
 		then
 			echo "INFO ! $JAVA_VERSION installed ... moving on."
 		else
 			echo " "
 			echo "WARNING ! $JAVA_VERSION not installed ... will install now."
 			apt-get update
-			apt-get --no-install-recommends -y install $JAVA_VERSION
+			apt-get --no-install-recommends -y install openjdk-21-jre-headless
 	fi
 if [ $JAVA_VERSION = "openjdk-25-jre" ]; then
     echo "INFO ! $JAVA_VERSION Selected"
-	if dpkg -s $JAVA_VERSION &> /dev/null
+	if dpkg -s openjdk-25-jre-headless &> /dev/null
 		then
 			echo "INFO ! $JAVA_VERSION installed ... moving on."
 		else
 			echo " "
 			echo "WARNING ! $JAVA_VERSION not installed ... will install now."
 			apt-get update
-			apt-get --no-install-recommends -y install $JAVA_VERSION
+			apt-get --no-install-recommends -y install openjdk-25-jre-headless
 	fi
 elif [ $JAVA_VERSION = "msopenjdk-21" ]; then
     echo "INFO ! $JAVA_VERSION Selected"
-	if dpkg -s $JAVA_VERSION &> /dev/null
+	if dpkg -s msopenjdk-21 &> /dev/null
 		then
 			echo "INFO ! $JAVA_VERSION installed ... moving on."
 		else
@@ -48,12 +48,12 @@ elif [ $JAVA_VERSION = "msopenjdk-21" ]; then
 			echo "WARNING ! $JAVA_VERSION not installed ... will install now."
 			wget https://packages.microsoft.com/config/debian/$DEBIAN_VERSION/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
 			dpkg -i packages-microsoft-prod.deb \
-			apt-get update && apt-get install -y $JAVA_VERSION \
+			apt-get update && apt-get install -y msopenjdk-21 \
 			apt-get -y update && apt-get -y --fix-broken install
 	fi
 elif [ $JAVA_VERSION = "msopenjdk-25" ]; then
     echo "INFO ! $JAVA_VERSION Selected"
-	if dpkg -s $JAVA_VERSION &> /dev/null
+	if dpkg -s msopenjdk-25 &> /dev/null
 		then
 			echo "INFO ! $JAVA_VERSION installed ... moving on."
 		else
@@ -61,7 +61,7 @@ elif [ $JAVA_VERSION = "msopenjdk-25" ]; then
 			echo "WARNING ! $JAVA_VERSION not installed ... will install now."
 			wget https://packages.microsoft.com/config/debian/$DEBIAN_VERSION/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
 			dpkg -i packages-microsoft-prod.deb \
-			apt-get update && apt-get install -y $JAVA_VERSION \
+			apt-get update && apt-get install -y msopenjdk-25 \
 			apt-get -y update && apt-get -y --fix-broken install
 	fi
 else
diff --git a/testing/install_script.sh b/testing/install_script.sh
index d1820e0..5017f2e 100644
--- a/testing/install_script.sh
+++ b/testing/install_script.sh
@@ -26,29 +26,29 @@ NEOFORGED_INSTALLER_FILE=https://maven.neoforged.net/releases/net/neoforged/neof
 # Install java
 if [ $JAVA_VERSION = "openjdk-21-jre" ]; then
     echo "INFO ! $JAVA_VERSION Selected"
-	if dpkg -s $JAVA_VERSION &> /dev/null
+	if dpkg -s openjdk-21-jre-headless &> /dev/null
 		then
 			echo "INFO ! $JAVA_VERSION installed ... moving on."
 		else
 			echo " "
 			echo "WARNING ! $JAVA_VERSION not installed ... will install now."
 			apt-get update
-			apt-get --no-install-recommends -y install $JAVA_VERSION
+			apt-get --no-install-recommends -y install openjdk-21-jre-headless
 	fi
 if [ $JAVA_VERSION = "openjdk-25-jre" ]; then
     echo "INFO ! $JAVA_VERSION Selected"
-	if dpkg -s $JAVA_VERSION &> /dev/null
+	if dpkg -s openjdk-25-jre-headless &> /dev/null
 		then
 			echo "INFO ! $JAVA_VERSION installed ... moving on."
 		else
 			echo " "
 			echo "WARNING ! $JAVA_VERSION not installed ... will install now."
 			apt-get update
-			apt-get --no-install-recommends -y install $JAVA_VERSION
+			apt-get --no-install-recommends -y install openjdk-25-jre-headless
 	fi
 elif [ $JAVA_VERSION = "msopenjdk-21" ]; then
     echo "INFO ! $JAVA_VERSION Selected"
-	if dpkg -s $JAVA_VERSION &> /dev/null
+	if dpkg -s msopenjdk-21 &> /dev/null
 		then
 			echo "INFO ! $JAVA_VERSION installed ... moving on."
 		else
@@ -56,12 +56,12 @@ elif [ $JAVA_VERSION = "msopenjdk-21" ]; then
 			echo "WARNING ! $JAVA_VERSION not installed ... will install now."
 			wget https://packages.microsoft.com/config/debian/$DEBIAN_VERSION/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
 			dpkg -i packages-microsoft-prod.deb \
-			apt-get update && apt-get install -y $JAVA_VERSION \
+			apt-get update && apt-get install -y msopenjdk-21 \
 			apt-get -y update && apt-get -y --fix-broken install
 	fi
 elif [ $JAVA_VERSION = "msopenjdk-25" ]; then
     echo "INFO ! $JAVA_VERSION Selected"
-	if dpkg -s $JAVA_VERSION &> /dev/null
+	if dpkg -s msopenjdk-25 &> /dev/null
 		then
 			echo "INFO ! $JAVA_VERSION installed ... moving on."
 		else
@@ -69,7 +69,7 @@ elif [ $JAVA_VERSION = "msopenjdk-25" ]; then
 			echo "WARNING ! $JAVA_VERSION not installed ... will install now."
 			wget https://packages.microsoft.com/config/debian/$DEBIAN_VERSION/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
 			dpkg -i packages-microsoft-prod.deb \
-			apt-get update && apt-get install -y $JAVA_VERSION \
+			apt-get update && apt-get install -y msopenjdk-25 \
 			apt-get -y update && apt-get -y --fix-broken install
 	fi
 else