From 35e4643619b5a4ce61cf0c171299e4c5d2ce17b4 Mon Sep 17 00:00:00 2001
From: Zake <74693042+xcgc@users.noreply.github.com>
Date: Fri, 11 Jun 2021 23:46:31 +0800
Subject: [PATCH] Use package manager to install Java

---
 minecraft/java/spigot/egg-spigot.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/minecraft/java/spigot/egg-spigot.json b/minecraft/java/spigot/egg-spigot.json
index 9d5d19dc..fa0665df 100644
--- a/minecraft/java/spigot/egg-spigot.json
+++ b/minecraft/java/spigot/egg-spigot.json
@@ -4,7 +4,7 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-06-11T16:17:27+01:00",
+    "exported_at": "2021-06-11T16:45:35+01:00",
     "name": "Spigot",
     "author": "support@pterodactyl.io",
     "description": "Spigot is the most widely-used modded Minecraft server software in the world. It powers many of the top Minecraft server networks around to ensure they can cope with their huge player base and ensure the satisfaction of their players. Spigot works by reducing and eliminating many causes of lag, as well as adding in handy features and settings that help make your job of server administration easier.",
@@ -26,7 +26,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napt update \r\napt install -y curl wget git openssl bash bc\r\n\r\nif [ \"${DL_VERSION}\" == \"latest\" ] || (( $(echo \"${DL_VERSION} >= 1.17\" | bc -l) )); then\r\n    mkdir -p \/usr\/local\/java\/16\r\n    curl -Lo java16.tar.gz https:\/\/github.com\/AdoptOpenJDK\/openjdk16-binaries\/releases\/download\/jdk-16.0.1%2B9_openj9-0.26.0\/OpenJDK16U-jdk_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz\r\n    tar -xzvf java16.tar.gz -C \/usr\/local\/java\/16 --strip-components=1\r\n    export PATH=\/usr\/local\/java\/16\/bin:$PATH\r\n    export JAVA_HOME=\/usr\/local\/java\/16\r\nelse\r\n    mkdir -p \/usr\/local\/java\/8\r\n    curl -Lo java8.tar.gz https:\/\/github.com\/AdoptOpenJDK\/openjdk8-binaries\/releases\/download\/jdk8u282-b08_openj9-0.24.0\/OpenJDK8U-jre_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz\r\n    tar -xzvf java8.tar.gz -C \/usr\/local\/java\/8 --strip-components=1\r\n    export PATH=\/usr\/local\/java\/8\/bin:$PATH\r\n    export JAVA_HOME=\/usr\/local\/java\/8\r\nfi\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n    cd \/mnt\/server\r\n\r\n    MODIFIED_DOWNLOAD=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\n    curl -sSL -o ${SERVER_JARFILE} ${MODIFIED_DOWNLOAD}\r\nelse\r\n    mkdir -p \/srv\/\r\n    cd \/srv\/\r\n    \r\n    wget https:\/\/hub.spigotmc.org\/jenkins\/job\/BuildTools\/lastSuccessfulBuild\/artifact\/target\/BuildTools.jar\r\n    \r\n    java -jar BuildTools.jar --rev ${DL_VERSION}\r\n\r\n    mv spigot-*.jar \/mnt\/server\/${SERVER_JARFILE}\r\nfi",
+            "script": "#!\/bin\/bash\r\n# Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napt update \r\napt install -y curl wget git openssl bash bc apt-transport-https gnupg software-properties-common\r\nwget -qO - https:\/\/adoptopenjdk.jfrog.io\/adoptopenjdk\/api\/gpg\/key\/public | apt-key add -\r\nadd-apt-repository --yes https:\/\/adoptopenjdk.jfrog.io\/adoptopenjdk\/deb\/\r\napt update\r\nmkdir -p \/usr\/share\/man\/man1\r\nif [ \"${DL_VERSION}\" == \"latest\" ] || (( $(echo \"${DL_VERSION} >= 1.17\" | bc -l) )); then\r\n    apt install -y adoptopenjdk-16-hotspot\r\nelse\r\n    apt install -y adoptopenjdk-8-hotspot\r\nfi\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n    cd \/mnt\/server\r\n\r\n    MODIFIED_DOWNLOAD=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\n    curl -sSL -o ${SERVER_JARFILE} ${MODIFIED_DOWNLOAD}\r\nelse\r\n    mkdir -p \/srv\/\r\n    cd \/srv\/\r\n    \r\n    wget https:\/\/hub.spigotmc.org\/jenkins\/job\/BuildTools\/lastSuccessfulBuild\/artifact\/target\/BuildTools.jar\r\n    \r\n    java -jar BuildTools.jar --rev ${DL_VERSION}\r\n\r\n    mv spigot-*.jar \/mnt\/server\/${SERVER_JARFILE}\r\nfi",
             "container": "debian:buster-slim",
             "entrypoint": "bash"
         }