From 49e9bff013a27b30ef512e1e195feb9d3b3d6cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Sat, 25 Feb 2023 10:24:18 +0100 Subject: [PATCH] Add OenJDK JRE download Downloads the correct OpenJDK JRE if the wrong (or no) version of Java is installed --- .ms-manager/java.sh | 206 +++++++++++++++++++++++++++++++++++--------- msman.sh | 3 +- 2 files changed, 168 insertions(+), 41 deletions(-) diff --git a/.ms-manager/java.sh b/.ms-manager/java.sh index d5fa6a4..5c9b788 100644 --- a/.ms-manager/java.sh +++ b/.ms-manager/java.sh @@ -1,66 +1,192 @@ #!/bin/bash -# Check if the correct version of Java is installed +# Setup Java +function setup_java { + # Get the required Java version for the Minecraft version + get_required_java + + # Check if java was downloaded by the script + check_script_java + + # Check if java is installed + if [[ $java_version == false ]]; then + check_java_exec + if [[ $java_version != false ]]; then + echo "System Java $java_version will be used." + fi + fi + + if [[ $java_version == false ]]; then + >&2 echo "Java $required_java is not installed." + >&2 echo "Java $required_java is required to run Minecraft $version." + # Ask the user if they want to download Adoptium JRE + ask_jre + fi + echo + echo +} + +# Ask the user if they want to download Adoptium JRE +function ask_jre { + echo "This script can download the correct Adoptium JRE into '$(echo $HOME)/.adoptium_java' for you." + echo "You have 15 seconds to confirm or the script will exit." + read -t 12 -p "Do you want to download Adoptium JRE? (y/N)" download_java + + if [[ $download_java == "y" ]] || [[ $download_java == "Y" ]]; then + get_os_arch + download_jre + check_script_java + if [[ $java_version == false ]]; then + >&2 echo "Java $required_java was not downloaded correctly." + >&2 echo "Please install Java $required_java manually." + exit 4 + fi + else + >&2 echo "Please install Java $required_java and run this script again." + exit 12 + fi +} + +# Check if java was downloaded by the script +function check_script_java { + if [[ -d "$(echo $HOME)/.adoptium_java" ]]; then + if [[ $required_java == "8" ]]; then + if [[ -d "$(echo $HOME)/.adoptium_java/jre8" ]]; then + java_version=8 + if [[ -f "$(echo $HOME).adoptium_java/jre8/bin/java" ]]; then + PATH="$(echo $HOME)/.adoptium_java/jre8/bin:$PATH" + fi + fi + elif [[ $required_java == "11" ]]; then + if [[ -d "$(echo $HOME)/.adoptium_java/jre11" ]]; then + java_version=11 + PATH="$(echo $HOME)/.adoptium_java/jre11/bin:$PATH" + fi + elif [[ $required_java == "16" ]]; then + if [[ -d "$(echo $HOME)/.adoptium_java/jre16" ]]; then + java_version=16 + PATH="$(echo $HOME)/.adoptium_java/jre16/bin:$PATH" + fi + elif [[ $required_java == "17" ]]; then + if [[ -d "$(echo $HOME)/.adoptium_java/jre17" ]]; then + java_version=17 + PATH="$(echo $HOME)/.adoptium_java/jre17/bin:$PATH" + fi + fi + check_java_exec + if [[ $java_version == $required_java ]]; then + echo "Java $java_version detected in '$(echo $HOME)/.adoptium_java/jre$(echo $java_version)/bin/java.' will be used." + else + java_version=false + fi + else + java_version=false + fi +} + +# Get the system Java version +function check_java_exec { +# Check if java is installed + if ! command -v java &> /dev/null + then + java_version=false + fi + + # If java is installed, get the version (the java_version won't be 0) + if [[ $java_version != false ]]; then + # Get the current Java version and extract the build number + java_version=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}' | awk -F '.' '{print $1}') + fi +} + +# Get the required Java version for the Minecraft version # For version 1.8 to 1.11 use java 8 # For version 1.12 to 1.16.4 use java 11 # For version 1.16.5 use java 16 # For version 1.17.1 to 1.18.1+ use java 17 -function check_java { -# Check if java is installed - if ! command -v java &> /dev/null - then - >&2 echo "Error: Java is not installed" - java_version="0" - fi - +function get_required_java { # Extract the middle number of the Minecraft version minecraft_middle=$(echo "$version" | awk -F '.' '{print $2}') - # If java is installed, get the version (the java_version won't be 0) - if [[ $java_version != "0" ]]; then - # Get the current Java version and extract the build number - java_version=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}' | awk -F '.' '{print $1}') - echo "Java $java_version is installed." - fi - # Check if the correct version of java is installed + # Get the java version for the defined server version if (( 8 <= minecraft_middle && minecraft_middle <= 11 )); then if ! [[ $java_version -eq 8 ]]; then - >&2 echo "Java 8 is required for Minecraft version $select_version. Please install Java 8." - if [[ $java_version == 0 ]]; then - exit 3 - fi - ask_continue + required_java=8 fi elif (( 12 <= minecraft_middle && minecraft_middle <= 16 )); then if ! [[ $java_version -eq 11 ]]; then - >&2 echo "Java 11 is required for Minecraft version $select_version. Please install Java 11." - if [[ $java_version == 0 ]]; then - exit 3 - fi - ask_continue + required_java=11 fi elif (( minecraft_middle == 17 )); then if ! [[ $java_version -eq 16 ]]; then - >&2 echo "Java 16 is required for Minecraft version $select_version. Please install Java 16." - if [[ $java_version == 0 ]]; then - exit 3 - fi - ask_continue + required_java=16 fi elif (( 18 <= minecraft_middle )); then if ! [[ $java_version -eq 17 ]]; then - >&2 echo "Java 17 is required for Minecraft version $select_version. Please install Java 17." - if [[ $java_version == 0 ]]; then - exit 3 - fi - ask_continue + required_java=17 fi else >&2 echo "Unsupported Minecraft version $select_version." - if [[ $java_version == 0 ]]; then - exit 3 - fi - ask_continue + fi +} + +# Check host architecture +function get_os_arch { + if [[ $(uname -m) == "x86_64" ]]; then + arch="x64" + elif [[ $(uname -m) == "aarch64" ]]; then + arch="aarch64" + else + >&2 echo "Unsupported architecture $(uname -m)." + >&2 echo "Please install Java $required_java manually." + exit 3 + fi +} + +# Download openjdk jre +function download_jre { + # Check if .java folder exists + if ! [[ -d "$(echo $HOME)/.adoptium_java" ]]; then + echo "Creating $(echo $HOME)/.adoptium_java folder" + mkdir "$(echo $HOME)/.adoptium_java" + fi + # Download the correct version of Java + if [[ $required_java == "8" ]]; then + echo "Downloading Adoptium JRE 8" + curl -L -o java.tar.gz "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u362-b09/OpenJDK8U-jre_$(echo $arch)_linux_hotspot_8u362b09.tar.gz" + echo "Extracting Java 8" + tar -xzf java.tar.gz + echo "Moving Java 8 to $(echo $HOME)/.adoptium_java/jre8" + mv jdk8u362-b09-jre "$(echo $HOME)/.adoptium_java/jre8" + echo "Removing temporary files" + rm java.tar.gz + elif [[ $required_java == "11" ]]; then + echo "Downloading Adoptium JRE 11" + curl -L -o java.tar.gz "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.18%2B10/OpenJDK11U-jre_$(echo $arch)_linux_hotspot_11.0.18_10.tar.gz" + echo "Extracting Java 11" + tar -xzf java.tar.gz + echo "Moving Java 11 to $(echo $HOME)/.adoptium_java/jre11" + mv jdk-11.0.18+10-jre "$(echo $HOME)/.adoptium_java/jre11" + echo "Removing temporary files" + rm java.tar.gz + elif [[ $required_java == "16" ]]; then + echo "Downloading Java 16" + curl -L -o java.tar.gz "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.18%2B10/OpenJDK11U-jre_$(echo $arch)_linux_hotspot_16.0.2_7.tar.gz" + echo "Extracting Java 16" + tar -xzf java.tar.gz + echo "Moving Java 16 to $(echo $HOME)/.adoptium_java/jre16" + mv jdk-16.0.2+7-jre "$(echo $HOME)/.adoptium_java/jre16" + echo "Removing temporary files" + rm java.tar.gz + elif [[ $required_java == "17" ]]; then + echo "Downloading Java 17" + curl -L -o java.tar.gz "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.6%2B10/OpenJDK17U-jre_$(echo $arch)_linux_hotspot_17.0.6_10.tar.gz" + echo "Extracting Java 17" + tar -xzf java.tar.gz + echo "Moving Java 17 to $(echo $HOME)/.adoptium_java/jre17" + mv jdk-17.0.6+10-jre "$(echo $HOME)/.adoptium_java/jre17" + echo "Removing temporary files" + rm java.tar.gz fi } diff --git a/msman.sh b/msman.sh index c242b2f..f2e9788 100755 --- a/msman.sh +++ b/msman.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ############################################################################################################# # Auto Update & Run PaperMC server script # # by jiriks74 # @@ -385,7 +386,7 @@ function main { check_version_valid # Check if the correct java version is installed - check_java + setup_java # Check if the server is up to date and if not, update it check_and_update