From 2700cb360eb80e5500373354a60d570125797a63 Mon Sep 17 00:00:00 2001 From: Talref <44619895+Talref@users.noreply.github.com> Date: Mon, 17 Jun 2024 14:49:33 +0200 Subject: [PATCH] ET Legacy install fix (#8) * et-install-fix * pelican and pterodactyl egg * more fixes --------- Co-authored-by: QuintenQVD0 Co-authored-by: Quinten <67589015+QuintenQVD0@users.noreply.github.com> --- .../etlegacy/egg-e-t-legacy.json | 6 +++--- .../etlegacy/egg-pterodactyl-e-t-legacy.json | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wolfenstein_enemy_territory/etlegacy/egg-e-t-legacy.json b/wolfenstein_enemy_territory/etlegacy/egg-e-t-legacy.json index 3157a7e4..55159951 100644 --- a/wolfenstein_enemy_territory/etlegacy/egg-e-t-legacy.json +++ b/wolfenstein_enemy_territory/etlegacy/egg-e-t-legacy.json @@ -23,7 +23,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Downloading $ET_VERSION bit ET Legacy version\"\r\n\r\nif [ $ET_VERSION == \"32\" ];then \r\n DOWNLOAD_URL=$(curl -s https:\/\/www.etlegacy.com\/download | grep \"Linux 32-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+')\r\n EXTENTION=i386\r\nelse\r\n DOWNLOAD_URL=$(curl -s https:\/\/www.etlegacy.com\/download | grep \"Linux 64-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+')\r\n EXTENTION=x86_64\r\nfi\r\n\r\necho \"Download URL: ${DOWNLOAD_URL}\"\r\ncurl -sSL -o etlegacy.tar.gz ${DOWNLOAD_URL}\r\n\r\necho \"Unpacking ET: Legacy\"\r\ntar xvf etlegacy.tar.gz --strip-components=1 \r\nrm etlegacy.tar.gz\r\n\r\n\r\nE_DOWNLOAD_URL=$(curl -s https:\/\/www.splashdamage.com\/games\/wolfenstein-enemy-territory\/ | grep .x86_full | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo --color=never '(http|https):\/\/[^\"]+')\r\n\r\necho \"Downloading latest enemy territory files from: ${E_DOWNLOAD_URL}\"\r\ncurl -sSL -o enemy_territory.zip ${E_DOWNLOAD_URL}\r\n\r\necho \"Unpacking enemy territory files\"\r\nunzip -o enemy_territory.zip\r\nrm enemy_territory.zip\r\n\r\necho \"Copying enemy territory assets\"\r\n.\/*.x86_keygen_V03.run --tar xvf .\/etmain\/\r\n#cp etmain\/pak*.pk3 \/mnt\/server\/etmain\/\r\n\r\n# Create .etlegacy as the server doesn't correctly create it\r\nmkdir -p \/mnt\/server\/.etlegacy\r\n\r\nrm *.run\r\n\r\nmv etlded.${EXTENTION} etlded\r\n\r\n## install end\r\necho \"-----------------------------------------\"\r\necho \"Installation completed...\"\r\necho \"-----------------------------------------\"", + "script": "#!\/bin\/bash\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Downloading $ET_VERSION bit ET Legacy version\"\r\n\r\nif [ $ET_VERSION == \"32\" ];then \r\n DOWNLOAD_URL=$(curl -s https:\/\/www.etlegacy.com\/download | grep \"i386 archive\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+')\r\n EXTENTION=i386\r\nelse\r\n DOWNLOAD_URL=$(curl -s https:\/\/www.etlegacy.com\/download | grep \"x86_64 archive\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+')\r\n EXTENTION=x86_64\r\nfi\r\n\r\necho \"Download URL: ${DOWNLOAD_URL}\"\r\ncurl -sSL -o etlegacy.tar.gz ${DOWNLOAD_URL}\r\n\r\necho \"Unpacking ET: Legacy\"\r\ntar xvf etlegacy.tar.gz --strip-components=1 \r\nrm etlegacy.tar.gz\r\n\r\n\r\nE_DOWNLOAD_URL=$(curl -s https:\/\/www.splashdamage.com\/games\/wolfenstein-enemy-territory\/ | grep .x86_full | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo --color=never '(http|https):\/\/[^\"]+')\r\n\r\necho \"Downloading latest enemy territory files from: ${E_DOWNLOAD_URL}\"\r\ncurl -sSL -o enemy_territory.zip ${E_DOWNLOAD_URL}\r\n\r\necho \"Unpacking enemy territory files\"\r\nunzip -o enemy_territory.zip\r\nrm enemy_territory.zip\r\n\r\necho \"Copying enemy territory assets\"\r\n.\/*.x86_keygen_V03.run --tar xvf .\/etmain\/\r\n#cp etmain\/pak*.pk3 \/mnt\/server\/etmain\/\r\n\r\n# Create .etlegacy as the server doesn't correctly create it\r\nmkdir -p \/mnt\/server\/.etlegacy\r\n\r\nrm *.run\r\n\r\nmv etlded.${EXTENTION} etlded\r\n\r\n## install end\r\necho \"-----------------------------------------\"\r\necho \"Installation completed...\"\r\necho \"-----------------------------------------\"", "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } @@ -33,7 +33,7 @@ "name": "ET Legacy Version", "description": "What version of the server to install. 32 or 64 bit version.", "env_variable": "ET_VERSION", - "default_value": "32", + "default_value": "64", "user_viewable": true, "user_editable": true, "rules": "required|integer|in:32,64", @@ -55,7 +55,7 @@ "name": "Enable Omnibot", "description": "", "env_variable": "OMNIBOT", - "default_value": "0", + "default_value": "1", "user_viewable": true, "user_editable": true, "rules": "required|boolean", diff --git a/wolfenstein_enemy_territory/etlegacy/egg-pterodactyl-e-t-legacy.json b/wolfenstein_enemy_territory/etlegacy/egg-pterodactyl-e-t-legacy.json index 38e82914..0f8a5788 100644 --- a/wolfenstein_enemy_territory/etlegacy/egg-pterodactyl-e-t-legacy.json +++ b/wolfenstein_enemy_territory/etlegacy/egg-pterodactyl-e-t-legacy.json @@ -22,9 +22,9 @@ }, "scripts": { "installation": { - "container": "ghcr.io/parkervcp/installers:debian", - "entrypoint": "bash", - "script": "#!/bin/bash\r\n\r\ncd /mnt/server\r\n\r\necho \"Downloading $ET_VERSION bit ET Legacy version\"\r\n\r\nif [ $ET_VERSION == \"32\" ];then \r\n DOWNLOAD_URL=$(curl -s https://www.etlegacy.com/download | grep \"Linux 32-bit bin\" | grep -Eoi '\u003ca [^\u003e]+\u003e' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https)://[^\"]+')\r\n EXTENTION=i386\r\nelse\r\n DOWNLOAD_URL=$(curl -s https://www.etlegacy.com/download | grep \"Linux 64-bit bin\" | grep -Eoi '\u003ca [^\u003e]+\u003e' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https)://[^\"]+')\r\n EXTENTION=x86_64\r\nfi\r\n\r\necho \"Download URL: ${DOWNLOAD_URL}\"\r\ncurl -sSL -o etlegacy.tar.gz ${DOWNLOAD_URL}\r\n\r\necho \"Unpacking ET: Legacy\"\r\ntar xvf etlegacy.tar.gz --strip-components=1 \r\nrm etlegacy.tar.gz\r\n\r\n\r\nE_DOWNLOAD_URL=$(curl -s https://www.splashdamage.com/games/wolfenstein-enemy-territory/ | grep .x86_full | grep -Eoi '\u003ca [^\u003e]+\u003e' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo --color=never '(http|https)://[^\"]+')\r\n\r\necho \"Downloading latest enemy territory files from: ${E_DOWNLOAD_URL}\"\r\ncurl -sSL -o enemy_territory.zip ${E_DOWNLOAD_URL}\r\n\r\necho \"Unpacking enemy territory files\"\r\nunzip -o enemy_territory.zip\r\nrm enemy_territory.zip\r\n\r\necho \"Copying enemy territory assets\"\r\n./*.x86_keygen_V03.run --tar xvf ./etmain/\r\n#cp etmain/pak*.pk3 /mnt/server/etmain/\r\n\r\n# Create .etlegacy as the server doesn't correctly create it\r\nmkdir -p /mnt/server/.etlegacy\r\n\r\nrm *.run\r\n\r\nmv etlded.${EXTENTION} etlded\r\n\r\n## install end\r\necho \"-----------------------------------------\"\r\necho \"Installation completed...\"\r\necho \"-----------------------------------------\"" + "script": "#!\/bin\/bash\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Downloading $ET_VERSION bit ET Legacy version\"\r\n\r\nif [ $ET_VERSION == \"32\" ];then \r\n DOWNLOAD_URL=$(curl -s https:\/\/www.etlegacy.com\/download | grep \"i386 archive\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+')\r\n EXTENTION=i386\r\nelse\r\n DOWNLOAD_URL=$(curl -s https:\/\/www.etlegacy.com\/download | grep \"x86_64 archive\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+')\r\n EXTENTION=x86_64\r\nfi\r\n\r\necho \"Download URL: ${DOWNLOAD_URL}\"\r\ncurl -sSL -o etlegacy.tar.gz ${DOWNLOAD_URL}\r\n\r\necho \"Unpacking ET: Legacy\"\r\ntar xvf etlegacy.tar.gz --strip-components=1 \r\nrm etlegacy.tar.gz\r\n\r\n\r\nE_DOWNLOAD_URL=$(curl -s https:\/\/www.splashdamage.com\/games\/wolfenstein-enemy-territory\/ | grep .x86_full | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo --color=never '(http|https):\/\/[^\"]+')\r\n\r\necho \"Downloading latest enemy territory files from: ${E_DOWNLOAD_URL}\"\r\ncurl -sSL -o enemy_territory.zip ${E_DOWNLOAD_URL}\r\n\r\necho \"Unpacking enemy territory files\"\r\nunzip -o enemy_territory.zip\r\nrm enemy_territory.zip\r\n\r\necho \"Copying enemy territory assets\"\r\n.\/*.x86_keygen_V03.run --tar xvf .\/etmain\/\r\n#cp etmain\/pak*.pk3 \/mnt\/server\/etmain\/\r\n\r\n# Create .etlegacy as the server doesn't correctly create it\r\nmkdir -p \/mnt\/server\/.etlegacy\r\n\r\nrm *.run\r\n\r\nmv etlded.${EXTENTION} etlded\r\n\r\n## install end\r\necho \"-----------------------------------------\"\r\necho \"Installation completed...\"\r\necho \"-----------------------------------------\"", + "container": "ghcr.io\/parkervcp\/installers:debian", + "entrypoint": "bash" } }, "variables": [ @@ -32,7 +32,7 @@ "name": "ET Legacy Version", "description": "What version of the server to install. 32 or 64 bit version.", "env_variable": "ET_VERSION", - "default_value": "32", + "default_value": "64", "user_viewable": true, "user_editable": true, "rules": "required|integer|in:32,64", @@ -52,7 +52,7 @@ "name": "Enable Omnibot", "description": "", "env_variable": "OMNIBOT", - "default_value": "0", + "default_value": "1", "user_viewable": true, "user_editable": true, "rules": "required|boolean",