diff --git a/minecraft/install_script.sh b/minecraft/install_script.sh index a72c8e1..38be898 100644 --- a/minecraft/install_script.sh +++ b/minecraft/install_script.sh @@ -38,32 +38,32 @@ elif [ $JAVA_VERSION = "openjdk-25-jre" ]; then apt-get update 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 msopenjdk-21 &> /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 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 msopenjdk-25 &> /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 msopenjdk-25 - apt-get -y update && apt-get -y --fix-broken install - fi +# elif [ $JAVA_VERSION = "msopenjdk-21" ]; then +# echo "INFO ! $JAVA_VERSION Selected" +# if [ dpkg -s msopenjdk-21 &> /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 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 msopenjdk-25 &> /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 msopenjdk-25 +# apt-get -y update && apt-get -y --fix-broken install +# fi else echo "ERROR ! Java version must be set first run" sleep infinity @@ -101,7 +101,7 @@ if [ $MC_TYPE = "vanilla" ]; then JAR=./mcserver-*.jar while [ true ]; do - java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui + java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui if [ $? -eq 0 ]; then break fi @@ -140,7 +140,7 @@ elif [ $MC_TYPE = "bukkit" ]; then JAR=./craftbukkit-*.jar while [ true ]; do - java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui + java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui if [ $? -eq 0 ]; then break fi @@ -179,7 +179,7 @@ elif [ $MC_TYPE = "fabric" ]; then JAR=./fabric-*-*.jar while [ true ]; do - java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui + java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui if [ $? -eq 0 ]; then break fi @@ -223,7 +223,7 @@ elif [ $MC_TYPE = "quilt" ]; then JAR=./quilt-server-launch.jar while [ true ]; do - java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui + java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui if [ $? -eq 0 ]; then break fi diff --git a/testing/install_script.sh b/testing/install_script.sh index 3cb2c35..2efcd9c 100644 --- a/testing/install_script.sh +++ b/testing/install_script.sh @@ -46,32 +46,32 @@ elif [ $JAVA_VERSION = "openjdk-25-jre" ]; then apt-get update 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 msopenjdk-21 &> /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 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 msopenjdk-25 &> /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 msopenjdk-25 - apt-get -y update && apt-get -y --fix-broken install - fi +# elif [ $JAVA_VERSION = "msopenjdk-21" ]; then +# echo "INFO ! $JAVA_VERSION Selected" +# if [ dpkg -s msopenjdk-21 &> /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 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 msopenjdk-25 &> /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 msopenjdk-25 +# apt-get -y update && apt-get -y --fix-broken install +# fi else echo "ERROR ! Java version must be set first run" sleep infinity @@ -109,7 +109,7 @@ if [ $MC_TYPE = "vanilla" ]; then JAR=./mcserver-*.jar while [ true ]; do - java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui + java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui if [ $? -eq 0 ]; then break fi @@ -148,7 +148,7 @@ elif [ $MC_TYPE = "bukkit" ]; then JAR=./craftbukkit-*.jar while [ true ]; do - java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui + java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui if [ $? -eq 0 ]; then break fi @@ -187,7 +187,7 @@ elif [ $MC_TYPE = "fabric" ]; then JAR=./fabric-*-*.jar while [ true ]; do - java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui + java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui if [ $? -eq 0 ]; then break fi @@ -231,7 +231,7 @@ elif [ $MC_TYPE = "quilt" ]; then JAR=./quilt-server-launch.jar while [ true ]; do - java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui + java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui if [ $? -eq 0 ]; then break fi