From 1f9c8ba3776d7ee28c5e03d9c4544713401f6927 Mon Sep 17 00:00:00 2001 From: fithwum Date: Mon, 20 Jul 2026 07:47:42 -0700 Subject: [PATCH] java detection fixes --- minecraft/install_script.sh | 8 ++++---- testing/install_script.sh | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/minecraft/install_script.sh b/minecraft/install_script.sh index 87f05da..2b5b5e5 100644 --- a/minecraft/install_script.sh +++ b/minecraft/install_script.sh @@ -18,7 +18,7 @@ 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 openjdk-21-jre-headless &> /dev/null + if [ dpkg -s openjdk-21-jre-headless &> /dev/null ] then echo "INFO ! $JAVA_VERSION installed ... moving on." else @@ -29,7 +29,7 @@ if [ $JAVA_VERSION = "openjdk-21-jre" ]; then fi if [ $JAVA_VERSION = "openjdk-25-jre" ]; then echo "INFO ! $JAVA_VERSION Selected" - if dpkg -s openjdk-25-jre-headless &> /dev/null + if [ dpkg -s openjdk-25-jre-headless &> /dev/null ] then echo "INFO ! $JAVA_VERSION installed ... moving on." else @@ -40,7 +40,7 @@ if [ $JAVA_VERSION = "openjdk-25-jre" ]; then fi elif [ $JAVA_VERSION = "msopenjdk-21" ]; then echo "INFO ! $JAVA_VERSION Selected" - if dpkg -s msopenjdk-21 &> /dev/null + if [ dpkg -s msopenjdk-21 &> /dev/null ] then echo "INFO ! $JAVA_VERSION installed ... moving on." else @@ -53,7 +53,7 @@ elif [ $JAVA_VERSION = "msopenjdk-21" ]; then fi elif [ $JAVA_VERSION = "msopenjdk-25" ]; then echo "INFO ! $JAVA_VERSION Selected" - if dpkg -s msopenjdk-25 &> /dev/null + if [ dpkg -s msopenjdk-25 &> /dev/null ] then echo "INFO ! $JAVA_VERSION installed ... moving on." else diff --git a/testing/install_script.sh b/testing/install_script.sh index 92cdbae..024d688 100644 --- a/testing/install_script.sh +++ b/testing/install_script.sh @@ -26,7 +26,7 @@ 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 openjdk-21-jre-headless &> /dev/null + if [ dpkg -s openjdk-21-jre-headless &> /dev/null ] then echo "INFO ! $JAVA_VERSION installed ... moving on." else @@ -37,7 +37,7 @@ if [ $JAVA_VERSION = "openjdk-21-jre" ]; then fi if [ $JAVA_VERSION = "openjdk-25-jre" ]; then echo "INFO ! $JAVA_VERSION Selected" - if dpkg -s openjdk-25-jre-headless &> /dev/null + if [ dpkg -s openjdk-25-jre-headless &> /dev/null ] then echo "INFO ! $JAVA_VERSION installed ... moving on." else @@ -48,7 +48,7 @@ if [ $JAVA_VERSION = "openjdk-25-jre" ]; then fi elif [ $JAVA_VERSION = "msopenjdk-21" ]; then echo "INFO ! $JAVA_VERSION Selected" - if dpkg -s msopenjdk-21 &> /dev/null + if [ dpkg -s msopenjdk-21 &> /dev/null ] then echo "INFO ! $JAVA_VERSION installed ... moving on." else @@ -61,7 +61,7 @@ elif [ $JAVA_VERSION = "msopenjdk-21" ]; then fi elif [ $JAVA_VERSION = "msopenjdk-25" ]; then echo "INFO ! $JAVA_VERSION Selected" - if dpkg -s msopenjdk-25 &> /dev/null + if [ dpkg -s msopenjdk-25 &> /dev/null ] then echo "INFO ! $JAVA_VERSION installed ... moving on." else @@ -347,4 +347,4 @@ echo "INFO ! Starting Minecraft Server $MC_TYPE-$MC_VERSION" cd $MC_DIR exec ./run-$MC_TYPE-$MC_VERSION.sh -exit +exit \ No newline at end of file