diff --git a/testing/install_script.sh b/testing/install_script.sh index e0fb820..e5810aa 100644 --- a/testing/install_script.sh +++ b/testing/install_script.sh @@ -2,6 +2,8 @@ # Copyright (c) 2022 fithwum # All rights reserved +DEBIAN_VERSION=13 + MC_DIR_OLD=/MCserver MC_DIR=/mc_server @@ -22,32 +24,66 @@ FORGE_INSTALLER_FILE=https://maven.minecraftforge.net/net/minecraftforge/forge/$ NEOFORGED_INSTALLER_FILE=https://maven.neoforged.net/releases/net/neoforged/neoforge/$NEOFORGED_VERSION/neoforge-$NEOFORGED_VERSION-installer.jar # Install java -if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null - then - echo "INFO ! openjdk-$JAVA_VERSION-jre-headless installed ... moving on." - else - echo " " - echo "WARNING ! openjdk-$JAVA_VERSION-jre-headless not installed ... will install now." - apt-get update - apt-get --no-install-recommends -y install openjdk-$JAVA_VERSION-jre-headless +if [ $MC_TYPE = "openjdk-21-jre" ]; then + echo "INFO ! $JAVA_VERSION Selected" + if dpkg -s $JAVA_VERSION &> /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 + fi +if [ $MC_TYPE = "openjdk-25-jre" ]; then + echo "INFO ! $JAVA_VERSION Selected" + if dpkg -s $JAVA_VERSION &> /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 + fi +elif [ $MC_TYPE = "msopenjdk-21" ]; then + echo "INFO ! $JAVA_VERSION Selected" + if dpkg -s $JAVA_VERSION &> /dev/null + then + echo "INFO ! $JAVA_VERSION installed ... moving on." + else + echo " " + 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 -y update && apt-get -y --fix-broken install + fi +elif [ $MC_TYPE = "msopenjdk-25" ]; then + echo "INFO ! $JAVA_VERSION Selected" + if dpkg -s $JAVA_VERSION &> /dev/null + then + echo "INFO ! $JAVA_VERSION installed ... moving on." + else + echo " " + 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 -y update && apt-get -y --fix-broken install + fi +else + echo "ERROR ! Java version must be set first run" + sleep infinity fi -# if dpkg -s msopenjdk-$JAVA_VERSION &> /dev/null -# then -# echo "INFO ! msopenjdk-$JAVA_VERSION installed ... moving on." -# else -# echo " " -# echo "WARNING ! msopenjdk-$JAVA_VERSION not installed ... will install now." -# wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ -# dpkg -i packages-microsoft-prod.deb \ -# apt-get update && apt-get install -y msopenjdk-25 \ -# apt-get -y update && apt-get -y --fix-broken install -# fi + + + + # Main install (Debian). # Check for server files and download if needed. - -# WORKING if [ $MC_TYPE = "vanilla" ]; then echo "INFO ! Vanilla Selected" if [ -e $MC_DIR/mcserver-$MC_VERSION.jar ] @@ -209,8 +245,6 @@ elif [ $MC_TYPE = "quilt" ]; then chmod +x run-$MC_TYPE-$MC_VERSION.sh cd .. fi - -# NOT WORKING elif [ $MC_TYPE = "forge" ]; then echo "INFO ! Forge Selected" if [ -e $MC_DIR/forge-$MC_VERSION-$FORGE_VERSION-installer.jar ]