From 0ca91eb652e88a56eb47734038e260454354025d Mon Sep 17 00:00:00 2001 From: danny6167 Date: Mon, 29 Apr 2019 21:58:28 +0800 Subject: [PATCH] Update egg-e-t-legacy.json - Correct stop command - Add MAP to start params and server vars so server will init - Work in /tmp/ to avoid leaving installers and unneeded files in the server directory - Slightly re-order some of the setup code - Add startup string matching so server can update status to running - Create '/mnt/server/.etlegacy' during setup needed for the servers sqlite database (server wont create it its self) --- etlegacy/etlegacy/egg-e-t-legacy.json | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/etlegacy/etlegacy/egg-e-t-legacy.json b/etlegacy/etlegacy/egg-e-t-legacy.json index 2c3fec2d..27ad99b6 100644 --- a/etlegacy/etlegacy/egg-e-t-legacy.json +++ b/etlegacy/etlegacy/egg-e-t-legacy.json @@ -3,21 +3,21 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2019-03-11T06:46:01-04:00", + "exported_at": "2019-04-29T21:52:18+08:00", "name": "ET Legacy", "author": "parker@parkervcp.com", "description": "Welcome to Enemy Territory: Legacy, an open source project that aims to create a fully compatible client and server for the popular online FPS game Wolfenstein: Enemy Territory - whose gameplay is still considered unmatched by many, despite its great age.", "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source", - "startup": ".\/etlded +set net_port {{SERVER_PORT}}", + "startup": ".\/etlded +set net_port {{SERVER_PORT}} +map {{MAP}}", "config": { "files": "{\r\n \"etmain\/etl_server.cfg\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"\/\/set net_ip \\\"\\\"\": \"set net_ip \\\"0.0.0.0\\\"\",\r\n \"\/\/set net_port \\\"27960\\\"\": \"set net_port \\\"{{server.build.env.SERVER_PORT}}\\\"\"\r\n }\r\n }\r\n}", - "startup": "{}", + "startup": "{\r\n \"done\": \"------ Server Initialization ------\",\r\n \"userInteraction\": []\r\n}", "logs": "{}", - "stop": "^C" + "stop": "quit" }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n\r\napt-get update\r\napt-get -y install wget curl zip unzip\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 wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 32-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` -O etlegacy.tar.gz\r\nelse\r\n wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 64-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` O etlegacy.tar.gz\r\nfi\r\n\r\necho \"Downloading latest enemy territory files\"\r\n\r\nwget `curl https:\/\/www.splashdamage.com\/games\/wolfenstein-enemy-territory\/ | grep .x86_full | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo --color=never '(http|https):\/\/[^\"]+'` -O enemy_terrain.zip\r\n\r\necho \"Unpacking enemy terrain files\"\r\nunzip enemy_terrain.zip\r\n\r\n.\/*.x86_keygen_V03.run --noexec --keep\r\n\r\necho \"Unpacking \"\r\ntar --strip-components=1 -xzvf etlegacy.tar.gz\r\n\r\ncp \/mnt\/server\/et-linux_work\/etmain\/pak* \/mnt\/server\/etmain\/", + "script": "#!\/bin\/bash\r\n\r\napt-get update\r\napt-get -y install wget curl zip unzip\r\n\r\ncd \/tmp\/\r\n\r\necho \"Downloading $ET_VERSION bit ET Legacy version\"\r\n\r\nif [ $ET_VERSION == \"32\" ];then \r\n wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 32-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` -O etlegacy.tar.gz\r\nelse\r\n wget `curl https:\/\/www.etlegacy.com\/download | grep \"Linux 64-bit bin\" | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo '(http|https):\/\/[^\"]+'` O etlegacy.tar.gz\r\nfi\r\n\r\necho \"Unpacking ET: Legacy\"\r\ntar --strip-components=1 -xzvf etlegacy.tar.gz -C \/mnt\/server\/\r\n\r\necho \"Downloading latest enemy territory files\"\r\nwget `curl https:\/\/www.splashdamage.com\/games\/wolfenstein-enemy-territory\/ | grep .x86_full | grep -Eoi ']+>' | grep -Eo 'href=\"[^\\\"]+\"' | grep -Eo --color=never '(http|https):\/\/[^\"]+'` -O enemy_territory.zip\r\n\r\necho \"Unpacking enemy territory files\"\r\nunzip enemy_territory.zip\r\n\r\necho \"Copying enemy territory assets\"\r\n.\/*.x86_keygen_V03.run --tar xvf .\/etmain\/\r\ncp 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", "container": "ubuntu:18.04", "entrypoint": "bash" } @@ -31,6 +31,15 @@ "user_viewable": 1, "user_editable": 1, "rules": "required|integer|in:32, 64" + }, + { + "name": "Default Map", + "description": "The default map to use when starting the server.", + "env_variable": "MAP", + "default_value": "oasis", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string|max:20" } ] -} \ No newline at end of file +}