From a19a6786006d0b46f9031c5c6fa6d493f50611bb Mon Sep 17 00:00:00 2001 From: ImLighty Date: Thu, 16 Nov 2023 16:54:25 +0100 Subject: [PATCH] Ready! --- README.md | 6 +++++- egg.json | 6 +++--- startup.sh | 9 +++++---- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 911bd22..28ce752 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,8 @@ An egg used to run Dragonfly inside of Pterodactyl. -> Dragonfly is a Minecraft Bedrock Edition server software written in Go. More information can be found on their GitHub [repository](https://github.com/df-mc/dragonfly) and their [Discord server](https://discord.gg/U4kFWHhTNR) \ No newline at end of file +> Dragonfly is a Minecraft Bedrock Edition server software written in Go. More information can be found on their GitHub [repository](https://github.com/df-mc/dragonfly) and their [Discord server](https://discord.gg/U4kFWHhTNR) + +## Installation + +Just import the egg.json file into your Pterodactyl panel and you're good to go! The script and Docker image will be automatically updated on each server start. \ No newline at end of file diff --git a/egg.json b/egg.json index 173d809..2d15088 100644 --- a/egg.json +++ b/egg.json @@ -4,16 +4,16 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2023-11-16T09:24:36-05:00", + "exported_at": "2023-11-16T10:46:21-05:00", "name": "Dragonfly", "author": "imlighty@apexie.dev", "description": "A Go egg optimized to run Dragonfly, a Minecraft Bedrock Edition server software written in Go. The installer will compile the cloned repository given by the GitHub URL variable", "features": null, "docker_images": { - "golang:bullseye": "golang:bullseye" + "ghcr.io\/imlighty\/dragonfly-pterodactyl:main": "ghcr.io\/imlighty\/dragonfly-pterodactyl:main" }, "file_denylist": [], - "startup": "wget -O - https:\/\/raw.githubusercontent.com\/imlighty\/dragonfly-pterodactyl\/main\/startup.sh | bash", + "startup": "curl -s https:\/\/raw.githubusercontent.com\/imlighty\/dragonfly-pterodactyl\/main\/startup.sh | bash && .\/server", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Server running on\"\r\n}", diff --git a/startup.sh b/startup.sh index 28e2c9c..ebc7ce3 100644 --- a/startup.sh +++ b/startup.sh @@ -4,6 +4,7 @@ echo "machine ${GIT_SERVER} login ${GIT_USERNAME} password ${GIT_PASSWORD}" >> ~ if [ ! -d "src" ]; then git clone ${GIT_REPO} src + git config pull.rebase false cd src git checkout ${GIT_BRANCH} || exit 1 cd .. @@ -17,9 +18,9 @@ cd src go build -o ../server ${MAIN_FILE} || exit 1 cd .. -if [ -f "~/.netrc" ]; then - rm ~/.netrc +if [ -f ".netrc" ]; then + rm .netrc fi -if [ -f "~/.wget-hsts" ]; then - rm ~/.wget-hsts +if [ -f ".wget-hsts" ]; then + rm .wget-hsts fi \ No newline at end of file