Merge pull request #10 from keepittechie/function-installJar-update

improved installJar function.

Author: keepittechie

docker_build/install-docker.sh

@@ -6,7 +6,6 @@
 # ANSI color codes
 RED='\033[0;31m'
 GREEN='\033[0;32m'
-BLUE='\033[0;34m'
 NC='\033[0;0m' # No Color
 
 # Define Minecraft server directory
@@ -15,94 +14,79 @@ MINECRAFT_DIR="/data/minecraft"
 # Create Minecraft directory
 mkdir -p "$MINECRAFT_DIR" # Create the directory
 
-function version {
+version() {
     echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'
 }
 
 # Select which java version to use
-if [ $(version $SERVER_VERSION) -ge $(version "1.20.5") ]; then
+if [ "$(version "$SERVER_VERSION")" -ge "$(version "1.20.5")" ]; then
     export JAVA_HOME="/usr/lib/jvm/java-21-openjdk"
-    export PATH=$JAVA_HOME/bin:$PATH
-    JAVA_BINARY=$JAVA_HOME/bin/java
+    export PATH="$JAVA_HOME/bin:$PATH"
     echo "Using java version 21..."
-elif [ $(version $SERVER_VERSION) -ge $(version "1.17") ]; then
+elif [ "$(version "$SERVER_VERSION")" -ge "$(version "1.17")" ]; then
     export JAVA_HOME="/usr/lib/jvm/java-17-openjdk"
-    export PATH=$JAVA_HOME/bin:$PATH
-    JAVA_BINARY=$JAVA_HOME/bin/java
+    export PATH="$JAVA_HOME/bin:$PATH"
     echo "Using java version 17..."
 else
     export JAVA_HOME="/usr/lib/jvm/java-8-openjdk"
-    export PATH=$JAVA_HOME/bin:$PATH
-    JAVA_BINARY=$JAVA_HOME/bin/java
+    export PATH="$JAVA_HOME/bin:$PATH"
     echo "Using java version 8..."
 fi
 
 ls -l /data
 # ls -l /
 
 # Download the specific Minecraft server version
-# Originally I had it check if either the server jar either exists, or if the SERVER_VERSION or SERVER_SOFTWARE had changed, before downloading.
-# I decided against this so you get the newest build every time you restart the container.
-# Feel free to change this if you want to, by adding this if statement around the current one: if [ ! -e "$MINECRAFT_DIR"/*.jar ]  || [ "grep -Po 'Minecraft Server Type: \K.*' "/opt/minecraft/server_info.txt"" != $SERVER_SOFTWARE ] || [ "grep -Po 'Minecraft Server Version: \K.*' "/opt/minecraft/server_info.txt"" != $SERVER_VERSION ]; then
 if [ "$SERVER_SOFTWARE" = "paper" ]; then
-    
-    # Get the build number of the most recent build
-    latest_build=$(curl -sX GET "https://papermc.io/api/v2"/projects/"paper"/versions/"$SERVER_VERSION"/builds -H 'accept: application/json' | jq '.builds [-1].build')
-    
-    # Construct download URL
-    download_url="https://papermc.io/api/v2"/projects/"paper"/versions/"$SERVER_VERSION"/builds/"$latest_build"/downloads/"paper"-"$SERVER_VERSION"-"$latest_build".jar
-    
-    # Download file
+    latest_build=$(curl -sX GET "https://papermc.io/api/v2/projects/paper/versions/$SERVER_VERSION/builds" -H 'accept: application/json' | jq '.builds[-1].build')
+    download_url="https://papermc.io/api/v2/projects/paper/versions/$SERVER_VERSION/builds/$latest_build/downloads/paper-$SERVER_VERSION-$latest_build.jar"
     SERVER_JAR="$MINECRAFT_DIR/paper-$SERVER_VERSION.jar"
     wget -O "$SERVER_JAR" "$download_url"
 
 elif [ "$SERVER_SOFTWARE" = "purpur" ]; then
-    # Construct download URL
-    download_url="https://api.purpurmc.org/v2/purpur/"$SERVER_VERSION"/latest/download"
-    
-    # Download file
+    download_url="https://api.purpurmc.org/v2/purpur/$SERVER_VERSION/latest/download"
     SERVER_JAR="$MINECRAFT_DIR/purpur-$SERVER_VERSION.jar"
     wget -O "$SERVER_JAR" "$download_url"
 
 elif [ "$SERVER_SOFTWARE" = "vanilla" ]; then
-    # Get the download url from mojang
     download_url=$(curl -sX GET "https://launchermeta.mojang.com/mc/game/version_manifest.json" | jq -r --arg ver "$SERVER_VERSION" '.versions[] | select(.id == $ver) | .url' | xargs curl -s | jq -r '.downloads.server.url')
-    
-    # Download file
     SERVER_JAR="$MINECRAFT_DIR/vanilla-$SERVER_VERSION.jar"
     wget -O "$SERVER_JAR" "$download_url"
 
 elif [ "$SERVER_SOFTWARE" = "manual" ]; then
-    $SERVER_JAR = "$MINECRAFT_DIR/$SERVER_JAR"
+    SERVER_JAR="$MINECRAFT_DIR/$SERVER_JAR"
     if [ -f "$SERVER_JAR" ]; then
         echo -e "${GREEN}Minecraft server JAR file found.${NC}"
     else
         echo -e "${RED}Failed to find the Minecraft server JAR file. Exiting...${NC}"
         exit 1
     fi
+
 elif [ "$SERVER_SOFTWARE" = "fabric" ]; then
     loader_version=$(curl -sX GET "https://meta.fabricmc.net/v2/versions/loader/$SERVER_VERSION" | jq -r '[.[] | select(.loader.stable == true)] | sort_by(.loader.build) | last | .loader.version')
     installer_version=$(curl -sX GET "https://meta.fabricmc.net/v2/versions/installer" | jq -r '[.[] | select(.stable == true)] | sort_by(.version) | last | .version')
     download_url="https://meta.fabricmc.net/v2/versions/loader/$SERVER_VERSION/$loader_version/$installer_version/server/jar"
     SERVER_JAR="$MINECRAFT_DIR/fabric-$SERVER_VERSION.jar"
     wget -O "$SERVER_JAR" "$download_url"
 fi
+
 # Write Minecraft server type and version to a text file
 echo "Minecraft Server Type: $SERVER_SOFTWARE" | tee "$MINECRAFT_DIR/server_info.txt"
 echo "Minecraft Server Version: $SERVER_VERSION" | tee -a "$MINECRAFT_DIR/server_info.txt"
 
 # Change to Minecraft directory
-cd "$MINECRAFT_DIR"
+cd "$MINECRAFT_DIR" || exit
 
-# Start server and accept the EULA if the file does not exist. 
-if [ ! -e $MINECRAFT_DIR"/eula.txt" ]; then
-    java -Xms1024M -Xmx1024M -jar $SERVER_JAR nogui
+# Start server and accept the EULA if the file does not exist.
+if [ ! -e "$MINECRAFT_DIR/eula.txt" ]; then
+    java -Xms1024M -Xmx1024M -jar "$SERVER_JAR" nogui
     # Accept EULA by modifying eula.txt
     echo -e "${GREEN}Accepting EULA...${NC}"
     sed -i 's/eula=false/eula=true/g' eula.txt
     sed -i 's/enable-rcon=false/enable-rcon=true/g' server.properties
     sed -i 's/rcon.password=/rcon.password=mcsli-docker/g' server.properties
 fi
+
 echo -e "${GREEN}Minecraft server installation and setup complete! Starting...${NC}"
 
 # Startup command; uses aikar's flags for better garbage collection