feat: updates from testing

Now completely uses teh packwiz link to download everything

minecraft/egg-mcsleepingserverstarter--packwiz--purpur.json

@@ -4,7 +4,7 @@
         "version": "PLCN_v1",
         "update_url": null
     },
-    "exported_at": "2025-01-03T23:02:40+00:00",
+    "exported_at": "2025-01-05T00:47:19+00:00",
     "name": "mcsleepingserverstarter - Packwiz - Purpur",
     "author": "compsoc@skynet.ie",
     "uuid": "bfb7ebe8-0040-412f-a7e1-ceacd6947ecd",
@@ -15,10 +15,10 @@
         "pid_limit"
     ],
     "docker_images": {
+        "Java 21": "ghcr.io\/parkervcp\/yolks:java_21",
         "Java 11": "ghcr.io\/parkervcp\/yolks:java_11",
         "Java 16": "ghcr.io\/parkervcp\/yolks:java_16",
         "Java 17": "ghcr.io\/parkervcp\/yolks:java_17",
-        "Java 21": "ghcr.io\/parkervcp\/yolks:java_21",
         "Java 8": "ghcr.io\/parkervcp\/yolks:java_8"
     },
     "file_denylist": [],
@@ -31,26 +31,12 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=purpur\r\nSYSTEM_ARCHITECTURE=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"x64\" || echo \"arm64\")\r\n# \" this clears teh parser errors\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n\techo -e \"Using supplied download url: ${DL_PATH}\"\r\n\tDOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n\tVER_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n\tLATEST_VERSION=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'`\r\n\r\n\tif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} version\"\r\n\t\tMINECRAFT_VERSION=${LATEST_VERSION}\r\n\tfi\r\n\t\r\n\tBUILD_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all | tostring | contains($BUILD)' | grep true`\r\n\tLATEST_BUILD=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r '.builds.latest'`\r\n\t\r\n\tif [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\"\r\n\t\tBUILD_NUMBER=${LATEST_BUILD}\r\n\tfi\r\n\t\r\n\tJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\t\r\n\techo \"Version being downloaded\"\r\n\techo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n\techo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n\tDOWNLOAD_URL=https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f server.properties ]; then\r\n    echo -e \"Downloading MC server.properties\"\r\n    curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties\r\nfi\r\n\r\n# Segment to install Packwiz\r\necho -e \"Installing Packwiz.\\n\"\r\nLATEST_ASSET_URL=$(curl -s https:\/\/api.github.com\/repos\/packwiz\/packwiz-installer-bootstrap\/releases\/latest | jq -r '.assets[].browser_download_url')\r\ncurl -s -L -o packwiz-installer-bootstrap.jar \"$LATEST_ASSET_URL\"\r\n\r\necho -e \"Packwiz installation complete.\\n\"\r\n\r\n\r\n# Segment to install mcsleepingserverstarter\r\necho -e \"Installing mcsleepingserverstarter.\\n\"\r\nif [ ! -f mcsleepingserverstarter-linux ]; then\r\n    echo -e \"Downloading mcsleepingserverstarter-linux-${SYSTEM_ARCHITECTURE}\"\r\n    curl -Lo mcsleepingserverstarter-linux https:\/\/github.com\/vincss\/mcsleepingserverstarter\/releases\/latest\/download\/mcsleepingserverstarter-linux-${SYSTEM_ARCHITECTURE}\r\nfi\r\nchmod +x mcsleepingserverstarter-linux\r\n\r\nif [ ! -f server.properties ]; then\r\n    echo -e \"Downloading MC server.properties\"\r\n    curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties\r\nfi\r\n\r\nif [ ! -f sleepingSettings.yml ]; then\r\n    echo -e \"Downloading sleepingSettings.yml\"\r\n    curl -o sleepingSettings.yml https:\/\/raw.githubusercontent.com\/vincss\/mcsleepingserverstarter\/master\/sleepingSettings.yml\r\nfi\r\n\r\necho -e \"Packwiz installation mcsleepingserverstarter.\\n\"",
+            "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=purpur\r\nSYSTEM_ARCHITECTURE=$([[ \"$(uname -m)\" == \"x86_64\" ]] && echo \"x64\" || echo \"arm64\")\r\n# \" this clears teh parser errors\r\n\r\ncd \/mnt\/server\r\n\r\n\r\n# Segment to install Packwiz\r\n# we are going to use this to pull in the project files, including teh one with minecraft and purpur version\r\necho -e \"Packwiz - Installation - start\\n\"\r\nLATEST_ASSET_URL=$(curl -s https:\/\/api.github.com\/repos\/packwiz\/packwiz-installer-bootstrap\/releases\/latest | jq -r '.assets[].browser_download_url')\r\ncurl -s -L -o packwiz-installer-bootstrap.jar \"$LATEST_ASSET_URL\"\r\necho -e \"Packwiz - Installation - finish\\n\"\r\n\r\necho -e \"Packwiz - Extract Details - start\\n\"\r\n# from https:\/\/gist.github.com\/kwmiebach\/e42dc4a43d5a2a0f2c3fdc41620747ab\r\nget_toml_value() {\r\n    local file=\"$1\"\r\n    local section=\"$2\"\r\n    local key=\"$3\"\r\n\r\n    get_section() {\r\n        local file=\"$1\"\r\n        local section=\"$2\"\r\n        sed -n \"\/^\\[$section\\]\/,\/^\\[\/p\" \"$file\" | sed '$d'\r\n    }\r\n    get_section \"$file\" \"$section\" | grep \"^$key \" | cut -d \"=\" -f2- | tr -d ' \"'\r\n}\r\n# download the pack.toml\r\ncurl -o pack.toml ${PACKWIZ_URL}\r\n\r\n# use teh above functrion\r\nMINECRAFT_VERSION=$(get_toml_value pack.toml versions minecraft)\r\nBUILD_NUMBER=$(get_toml_value pack.toml versions ${PROJECT})\r\necho -e \"Packwiz - Extract Details - finish\\n\"\r\n\r\necho -e \"Purpur - Download - Start\\n\"\r\nDOWNLOAD_URL=https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download\r\nJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\r\necho \"Version being downloaded\"\r\necho -e \"MC Version: ${MINECRAFT_VERSION}\"\r\necho -e \"Build: ${BUILD_NUMBER}\"\r\necho -e \"JAR Name of Build: ${JAR_NAME}\"\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\necho -e \"Purpur - Download - finish\\n\"\r\n\r\n\r\n# Segment to install mcsleepingserverstarter\r\necho -e \"Purpur - Download - start\\n\"\r\n\r\nif [ ! -f mcsleepingserverstarter-linux ]; then\r\n    echo -e \"Downloading mcsleepingserverstarter-linux-${SYSTEM_ARCHITECTURE}\"\r\n    curl -Lo mcsleepingserverstarter-linux https:\/\/github.com\/vincss\/mcsleepingserverstarter\/releases\/latest\/download\/mcsleepingserverstarter-linux-${SYSTEM_ARCHITECTURE}\r\nfi\r\nchmod +x mcsleepingserverstarter-linux\r\n\r\nif [ ! -f sleepingSettings.yml ]; then\r\n    echo -e \"Downloading sleepingSettings.yml\"\r\n    curl -o sleepingSettings.yml https:\/\/raw.githubusercontent.com\/vincss\/mcsleepingserverstarter\/master\/sleepingSettings.yml\r\nfi\r\n\r\necho -e \"Purpur - Download - finish\\n\"",
             "container": "ghcr.io\/parkervcp\/installers:alpine",
             "entrypoint": "ash"
         }
     },
     "variables": [
-        {
-            "name": "Minecraft Version",
-            "description": "The version of Minecraft to download. \r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest.",
-            "env_variable": "MINECRAFT_VERSION",
-            "default_value": "latest",
-            "user_viewable": true,
-            "user_editable": true,
-            "rules": [
-                "required",
-                "string",
-                "max:20"
-            ],
-            "sort": 2
-        },
         {
             "name": "Server Jar File",
             "description": "The name of the .jar file to run the server with.",
@@ -65,20 +51,6 @@
             ],
             "sort": 1
         },
-        {
-            "name": "Build Number",
-            "description": "The build number for the Purpur release.\r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest.",
-            "env_variable": "BUILD_NUMBER",
-            "default_value": "latest",
-            "user_viewable": true,
-            "user_editable": true,
-            "rules": [
-                "required",
-                "string",
-                "max:20"
-            ],
-            "sort": 3
-        },
         {
             "name": "Packwiz URL",
             "description": "The URL to the packwiz manifest.",
@@ -87,7 +59,7 @@
             "user_viewable": true,
             "user_editable": true,
             "rules": [],
-            "sort": 4
+            "sort": 2
         }
     ]
 }