From 2c738f899243fe5f1833744c60cd3fda082f4ef1 Mon Sep 17 00:00:00 2001 From: CDE <73063460+CDE90@users.noreply.github.com> Date: Sun, 17 Apr 2022 16:58:05 +0100 Subject: [PATCH 1/8] Create README.md --- bots/discord/rust/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 bots/discord/rust/README.md diff --git a/bots/discord/rust/README.md b/bots/discord/rust/README.md new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/bots/discord/rust/README.md @@ -0,0 +1 @@ + From 68a37908f4d23e20e86e117a283bcf95a6aeaef5 Mon Sep 17 00:00:00 2001 From: CDE <73063460+CDE90@users.noreply.github.com> Date: Sun, 17 Apr 2022 16:58:14 +0100 Subject: [PATCH 2/8] Add files via upload --- bots/discord/rust/egg-serenity.json | 89 +++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 bots/discord/rust/egg-serenity.json diff --git a/bots/discord/rust/egg-serenity.json b/bots/discord/rust/egg-serenity.json new file mode 100644 index 00000000..b872cead --- /dev/null +++ b/bots/discord/rust/egg-serenity.json @@ -0,0 +1,89 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1", + "update_url": null + }, + "exported_at": "2022-04-17T16:56:51+01:00", + "name": "Serenity", + "author": "unknown@unknown.com", + "description": "Creates a container that runs rust.", + "features": null, + "images": [ + "ghcr.io\/parkervcp\/yolks:rust_1.31", + "ghcr.io\/parkervcp\/yolks:rust_1.56", + "ghcr.io\/parkervcp\/yolks:rust_1.60", + "ghcr.io\/parkervcp\/yolks:rust_latest" + ], + "file_denylist": [], + "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; cargo run --release", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": [\r\n \"Finished\"\r\n ]\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# Rust Bot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\n## add git ending if it's not on the address\r\nif [[ ${GIT_ADDRESS} != *.git ]]; then\r\n GIT_ADDRESS=${GIT_ADDRESS}.git\r\nfi\r\n\r\nif [ -z \"${USERNAME}\" ] && [ -z \"${ACCESS_TOKEN}\" ]; then\r\n echo -e \"using anon api call\"\r\nelse\r\n GIT_ADDRESS=\"https:\/\/${USERNAME}:${ACCESS_TOKEN}@$(echo -e ${GIT_ADDRESS} | cut -d\/ -f3-)\"\r\nfi\r\n\r\n## pull git js bot repo\r\nif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n echo -e \"\/mnt\/server directory is not empty.\"\r\n if [ -d .git ]; then\r\n echo -e \".git directory exists\"\r\n if [ -f .git\/config ]; then\r\n echo -e \"loading info from git config\"\r\n ORIGIN=$(git config --get remote.origin.url)\r\n else\r\n echo -e \"files found with no git config\"\r\n echo -e \"closing out without touching things to not break anything\"\r\n exit 10\r\n fi\r\n fi\r\n\r\n if [ \"${ORIGIN}\" == \"${GIT_ADDRESS}\" ]; then\r\n echo \"pulling latest from github\"\r\n git pull\r\n fi\r\nelse\r\n echo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n if [ -z ${BRANCH} ]; then\r\n echo -e \"cloning default branch\"\r\n git clone ${GIT_ADDRESS} .\r\n else\r\n echo -e \"cloning ${BRANCH}'\"\r\n git clone --single-branch --branch ${BRANCH} ${GIT_ADDRESS} .\r\n fi\r\n\r\nfi\r\n\r\nexport HOME=\/mnt\/server\r\n\r\necho -e \"install complete\"\r\nexit 0", + "container": "rust:1.60.0-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Git Repo Address", + "description": "Git repo to clone\r\n\r\nI.E. https:\/\/github.com\/parkervcp\/repo_name", + "env_variable": "GIT_ADDRESS", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "Git Branch", + "description": "What branch to pull from github.\r\n\r\nDefault is blank to pull the repo default branch", + "env_variable": "BRANCH", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "Auto Update", + "description": "Pull the latest files on startup when using a GitHub repo.", + "env_variable": "AUTO_UPDATE", + "default_value": "0", + "user_viewable": true, + "user_editable": true, + "rules": "required|boolean" + }, + { + "name": "Git Username", + "description": "Username to auth with git.", + "env_variable": "USERNAME", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "Git Access Token", + "description": "Password to use with git.\r\n\r\nIt's best practice to use a Personal Access Token.\r\nhttps:\/\/github.com\/settings\/tokens\r\nhttps:\/\/gitlab.com\/-\/profile\/personal_access_tokens", + "env_variable": "ACCESS_TOKEN", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + }, + { + "name": "Bot Token", + "description": "The discord token used to run your bot. Sets to the environment variable `DISCORD_TOKEN`\r\n\r\nAlternatively, you can use a .env file", + "env_variable": "DISCORD_TOKEN", + "default_value": "", + "user_viewable": true, + "user_editable": true, + "rules": "nullable|string" + } + ] +} \ No newline at end of file From 774240d75c499fb24a29383bf8a6f59a46e37574 Mon Sep 17 00:00:00 2001 From: CDE <73063460+CDE90@users.noreply.github.com> Date: Sun, 17 Apr 2022 17:00:25 +0100 Subject: [PATCH 3/8] Update README.md --- bots/discord/rust/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bots/discord/rust/README.md b/bots/discord/rust/README.md index 8b137891..ea822c9c 100644 --- a/bots/discord/rust/README.md +++ b/bots/discord/rust/README.md @@ -1 +1,3 @@ +# serenity generic +This egg is designed to run any generic Rust application, allowing users to pull their own Rust discord bot from a GitHub repository. From 274ab72e20a35215f83692d9bd15b4c2813a7d60 Mon Sep 17 00:00:00 2001 From: CDE90 Date: Sun, 17 Apr 2022 17:01:41 +0100 Subject: [PATCH 4/8] Change directory name --- bots/discord/{rust => serenity}/README.md | 0 bots/discord/{rust => serenity}/egg-serenity.json | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename bots/discord/{rust => serenity}/README.md (100%) rename bots/discord/{rust => serenity}/egg-serenity.json (100%) diff --git a/bots/discord/rust/README.md b/bots/discord/serenity/README.md similarity index 100% rename from bots/discord/rust/README.md rename to bots/discord/serenity/README.md diff --git a/bots/discord/rust/egg-serenity.json b/bots/discord/serenity/egg-serenity.json similarity index 100% rename from bots/discord/rust/egg-serenity.json rename to bots/discord/serenity/egg-serenity.json From 4305e63bd2d13551a610f72e33445b28149a580a Mon Sep 17 00:00:00 2001 From: CDE <73063460+CDE90@users.noreply.github.com> Date: Sun, 17 Apr 2022 17:02:37 +0100 Subject: [PATCH 5/8] Update egg-serenity.json --- bots/discord/serenity/egg-serenity.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bots/discord/serenity/egg-serenity.json b/bots/discord/serenity/egg-serenity.json index b872cead..dd3ffc2d 100644 --- a/bots/discord/serenity/egg-serenity.json +++ b/bots/discord/serenity/egg-serenity.json @@ -6,7 +6,7 @@ }, "exported_at": "2022-04-17T16:56:51+01:00", "name": "Serenity", - "author": "unknown@unknown.com", + "author": "ethan.coward@icloud.com", "description": "Creates a container that runs rust.", "features": null, "images": [ @@ -86,4 +86,4 @@ "rules": "nullable|string" } ] -} \ No newline at end of file +} From eda031989bb5328d3a62258ec3ea14da093c9dbf Mon Sep 17 00:00:00 2001 From: CDE90 Date: Sun, 17 Apr 2022 17:05:39 +0100 Subject: [PATCH 6/8] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index bbed6550..60db1621 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [parkertron](/bots/discord/parkertron) Golang * [pixel-bot](/bots/discord/pixelbot) Python * [Redbot](/bots/discord/redbot) Python +* [serenity](/bots/discord/serenity) Rust * [SinusBot](/bots/discord/sinusbot) [Other](/bots/other) From e6ee11076c1bdcb7c4a06392aa85ee1b183a67b5 Mon Sep 17 00:00:00 2001 From: CDE90 Date: Sun, 17 Apr 2022 20:37:32 +0100 Subject: [PATCH 7/8] Rename egg to discord.rs --- README.md | 2 +- bots/discord/discord.rs/README.md | 3 +++ .../egg-discord-rs-generic.json} | 4 ++-- bots/discord/serenity/README.md | 3 --- 4 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 bots/discord/discord.rs/README.md rename bots/discord/{serenity/egg-serenity.json => discord.rs/egg-discord-rs-generic.json} (97%) delete mode 100644 bots/discord/serenity/README.md diff --git a/README.md b/README.md index 60db1621..97fc6a17 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [discord.java](bots/discord/discord.java) Java generic * [discord.js](bots/discord/discord.js) Node JS generic * [discord.py](bots/discord/discord.py) Python generic +* [discord.rs](bots/discord/discord.rs) Rust generic * [Dynamica](/bots/discord/dynamica) Node JS * [fragbot](/bots/discord/fragbot) Golang * [JMusicBot](/bots/discord/jmusicbot) Java @@ -40,7 +41,6 @@ If you are reading this it looks like you are looking to add an egg to your serv * [parkertron](/bots/discord/parkertron) Golang * [pixel-bot](/bots/discord/pixelbot) Python * [Redbot](/bots/discord/redbot) Python -* [serenity](/bots/discord/serenity) Rust * [SinusBot](/bots/discord/sinusbot) [Other](/bots/other) diff --git a/bots/discord/discord.rs/README.md b/bots/discord/discord.rs/README.md new file mode 100644 index 00000000..5e9499f7 --- /dev/null +++ b/bots/discord/discord.rs/README.md @@ -0,0 +1,3 @@ +# discord.rs generic + +This egg is designed to run any generic Rust application with cargo, allowing users to pull their own Rust discord bot from a GitHub repository. diff --git a/bots/discord/serenity/egg-serenity.json b/bots/discord/discord.rs/egg-discord-rs-generic.json similarity index 97% rename from bots/discord/serenity/egg-serenity.json rename to bots/discord/discord.rs/egg-discord-rs-generic.json index dd3ffc2d..c16f8195 100644 --- a/bots/discord/serenity/egg-serenity.json +++ b/bots/discord/discord.rs/egg-discord-rs-generic.json @@ -5,9 +5,9 @@ "update_url": null }, "exported_at": "2022-04-17T16:56:51+01:00", - "name": "Serenity", + "name": "discord.rs generic", "author": "ethan.coward@icloud.com", - "description": "Creates a container that runs rust.", + "description": "Creates a container that runs rust with cargo.", "features": null, "images": [ "ghcr.io\/parkervcp\/yolks:rust_1.31", diff --git a/bots/discord/serenity/README.md b/bots/discord/serenity/README.md deleted file mode 100644 index ea822c9c..00000000 --- a/bots/discord/serenity/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# serenity generic - -This egg is designed to run any generic Rust application, allowing users to pull their own Rust discord bot from a GitHub repository. From a58975246d8f781dfc4644f883d5c4b6d2b39775 Mon Sep 17 00:00:00 2001 From: CDE <73063460+CDE90@users.noreply.github.com> Date: Tue, 19 Apr 2022 13:33:12 +0000 Subject: [PATCH 8/8] Update installation script container --- bots/discord/discord.rs/egg-discord-rs-generic.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bots/discord/discord.rs/egg-discord-rs-generic.json b/bots/discord/discord.rs/egg-discord-rs-generic.json index c16f8195..2457cfa5 100644 --- a/bots/discord/discord.rs/egg-discord-rs-generic.json +++ b/bots/discord/discord.rs/egg-discord-rs-generic.json @@ -26,7 +26,7 @@ "scripts": { "installation": { "script": "#!\/bin\/bash\r\n# Rust Bot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\n## add git ending if it's not on the address\r\nif [[ ${GIT_ADDRESS} != *.git ]]; then\r\n GIT_ADDRESS=${GIT_ADDRESS}.git\r\nfi\r\n\r\nif [ -z \"${USERNAME}\" ] && [ -z \"${ACCESS_TOKEN}\" ]; then\r\n echo -e \"using anon api call\"\r\nelse\r\n GIT_ADDRESS=\"https:\/\/${USERNAME}:${ACCESS_TOKEN}@$(echo -e ${GIT_ADDRESS} | cut -d\/ -f3-)\"\r\nfi\r\n\r\n## pull git js bot repo\r\nif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n echo -e \"\/mnt\/server directory is not empty.\"\r\n if [ -d .git ]; then\r\n echo -e \".git directory exists\"\r\n if [ -f .git\/config ]; then\r\n echo -e \"loading info from git config\"\r\n ORIGIN=$(git config --get remote.origin.url)\r\n else\r\n echo -e \"files found with no git config\"\r\n echo -e \"closing out without touching things to not break anything\"\r\n exit 10\r\n fi\r\n fi\r\n\r\n if [ \"${ORIGIN}\" == \"${GIT_ADDRESS}\" ]; then\r\n echo \"pulling latest from github\"\r\n git pull\r\n fi\r\nelse\r\n echo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n if [ -z ${BRANCH} ]; then\r\n echo -e \"cloning default branch\"\r\n git clone ${GIT_ADDRESS} .\r\n else\r\n echo -e \"cloning ${BRANCH}'\"\r\n git clone --single-branch --branch ${BRANCH} ${GIT_ADDRESS} .\r\n fi\r\n\r\nfi\r\n\r\nexport HOME=\/mnt\/server\r\n\r\necho -e \"install complete\"\r\nexit 0", - "container": "rust:1.60.0-slim", + "container": "debian:buster-slim", "entrypoint": "bash" } },