From d591f5c2a2768b1642bfe9cb1da47cde82fbd649 Mon Sep 17 00:00:00 2001 From: papertots <12170984+papertots@users.noreply.github.com> Date: Wed, 21 Feb 2024 08:51:03 -0500 Subject: [PATCH] Update egg-singleplayer-tarkov.json Changed Node installation to use the official method. Integrated the github grab script for the SIT coop mod. --- game_eggs/eft/egg-singleplayer-tarkov.json | 60 ++++++++++++++++++---- 1 file changed, 50 insertions(+), 10 deletions(-) diff --git a/game_eggs/eft/egg-singleplayer-tarkov.json b/game_eggs/eft/egg-singleplayer-tarkov.json index 98141949..0f8fc23b 100644 --- a/game_eggs/eft/egg-singleplayer-tarkov.json +++ b/game_eggs/eft/egg-singleplayer-tarkov.json @@ -4,13 +4,13 @@ "version": "PTDL_v2", "update_url": null }, - "exported_at": "2024-02-21T03:47:21-05:00", + "exported_at": "2024-02-21T08:47:12-05:00", "name": "Singleplayer Tarkov", "author": "dino@papertots.page", "description": "The Stay in Tarkov project was born due to Battlestate Games' (BSG) reluctance to create the pure PvE version of Escape from Tarkov. The project's aim is simple, create a Cooperation PvE experience that retains progression.", "features": null, "docker_images": { - "ghcr.io\/pterodactyl\/yolks:debian": "ghcr.io\/pterodactyl\/yolks:debian" + "ghcr.io\/parkervcp\/yolks:debian": "ghcr.io\/parkervcp\/yolks:debian" }, "file_denylist": [], "startup": ".\/Aki.Server.exe", @@ -22,15 +22,15 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Singleplayer Tarkov Server Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n# Working directory for build requirements\r\ncd $HOME\r\n\r\n# Install git-lfs python3\r\napt update && apt install -yq git-lfs python3 unzip jq\r\n\r\n# Install Node Version Manager and NodeJS\r\ngit clone https:\/\/github.com\/nvm-sh\/nvm.git $HOME\/.nvm\r\nif [ -z \"$NODE_VERSION\" ] || [ \"$NODE_VERSION\" == \"LTS\" ]; then\r\n NODE_VERSION=$(curl -sSL https:\/\/nodejs.org\/download\/release\/index.json | jq -r '.[] | select(.lts!=false) | .version' | head -n1)\r\nfi\r\n. $HOME\/.nvm\/nvm.sh && nvm install $NODE_VERSION\r\n\r\n# Clone the SPT AKI repo\r\ngit clone https:\/\/dev.sp-tarkov.com\/SPT-AKI\/Server.git server\r\ncd $HOME\/server && git checkout $SPT_VERSION\r\n\r\n# Obtaining server files\r\ncd $HOME\/server\/project\/\r\ngit-lfs fetch --all && git-lfs pull\r\n\r\n# Install npm dependencies and build\r\n. $HOME\/.nvm\/nvm.sh && npm install && npm run build:release\r\nmv $HOME\/server\/project\/build\/* \/mnt\/server\/\r\n\r\n# Obtain SIT Coop mod\r\ngit clone https:\/\/github.com\/stayintarkov\/SIT.Aki-Server-Mod \/mnt\/server\/user\/mods\/SITCoop\r\ncd \/mnt\/server\/user\/mods\/SITCoop && git checkout $SIT_VERSION", - "container": "ghcr.io\/pterodactyl\/installers:debian", + "script": "#!\/bin\/bash\r\n# Singleplayer Tarkov Server Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n# Working directory for build requirements\r\ncd $HOME\r\n\r\n# Install git-lfs python3\r\napt update && apt install -yq git-lfs python3 jq\r\n\r\n# Install NodeJS\r\ncurl -fsSL https:\/\/deb.nodesource.com\/setup_$NODE_VERSION.x | bash - && apt-get install -y nodejs\r\n\r\n# Clone the SPT AKI repo\r\ngit clone https:\/\/dev.sp-tarkov.com\/SPT-AKI\/Server.git server\r\ncd $HOME\/server && git checkout $SPT_VERSION\r\n\r\n# Obtaining server files\r\ncd $HOME\/server\/project\/\r\ngit-lfs fetch --all && git-lfs pull\r\n\r\n# Install npm dependencies and build\r\nnpm install && npm run build:release\r\nmv $HOME\/server\/project\/build\/* \/mnt\/server\/\r\n\r\n# Obtain SIT coop mod\r\nmkdir \/mnt\/server\/user \r\nmkdir \/mnt\/server\/user\/mods \r\ncd \/mnt\/server\/user\/mods\r\n\r\nif [ -z \"${GITHUB_USER}\" ] && [ -z \"${GITHUB_OAUTH_TOKEN}\" ] ; then\r\n echo -e \"using anon api call\"\r\nelse\r\n echo -e \"user and oauth token set\"\r\n alias curl='curl -u ${GITHUB_USER}:${GITHUB_OAUTH_TOKEN} '\r\nfi\r\n\r\n## get SIT coop mod release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${SIT_PACKAGE}\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${SIT_PACKAGE}\/releases\")\r\n\r\nif [ -z \"${SIT_VERSION}\" ] || [ \"${SIT_VERSION}\" == \"latest\" ]; then\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${SIT_NAME})\r\nelse\r\n VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"${SIT_VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n if [ \"${SIT_VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"${SIT_VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i ${SIT_NAME})\r\n else\r\n echo -e \"defaulting to latest release\"\r\n DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n fi\r\nfi\r\nwget ${DOWNLOAD_URL} -O ${SIT_NAME}\r\nunzip -o ${SIT_NAME}\r\nrm ${SIT_NAME}\r\n\r\n# Run server once to regenerate the necessary config files\r\n# cd \/mnt\/server\r\n# timeout --preserve-status 10 \/mnt\/server\/Aki.Server.exe -k=15\r\n# sleep 15s", + "container": "ghcr.io\/parkervcp\/installers:debian", "entrypoint": "bash" } }, "variables": [ { "name": "SPT-AKI Version", - "description": "Version of the SPT-AKI version to use.\r\nUse \"latest\" for the latest tag on the master branch.\r\n\r\nSPT-AKI: https:\/\/dev.sp-tarkov.com\/SPT-AKI\/Server", + "description": "Version of the SPT-AKI version to use, by git hash\/tag\r\n\r\nSPT-AKI: https:\/\/dev.sp-tarkov.com\/SPT-AKI\/Server", "env_variable": "SPT_VERSION", "default_value": "40b999d04c68f1f52ab152d163c086a1c50f489b", "user_viewable": true, @@ -40,9 +40,9 @@ }, { "name": "SITCoop Version", - "description": "Version of the SIT co-op mod for the server to use, by git hash.\r\n\r\nSITCoop: https:\/\/github.com\/stayintarkov\/SIT.Aki-Server-Mod", + "description": "Version of the SIT co-op mod for the server. Use \"latest\" for latest release, or the github release\/tag\/hash.\r\n\r\nSITCoop: https:\/\/github.com\/stayintarkov\/SIT.Aki-Server-Mod", "env_variable": "SIT_VERSION", - "default_value": "022caac252205e1b9ca30b3610884ad1b05d0dc1", + "default_value": "latest", "user_viewable": true, "user_editable": true, "rules": "required|string", @@ -50,12 +50,52 @@ }, { "name": "NodeJS Version", - "description": "Version of NodeJS to use to build the server.\r\nUse \"LTS\" for latest LTS version, or \"20.10.0\" for the recommended version.", + "description": "Version of NodeJS to use to build the server.\r\nUse \"lts\" for latest LTS version, or \"18\" for the version recommended by the SPT-AKI repo.", "env_variable": "NODE_VERSION", - "default_value": "20.10.0", + "default_value": "lts", "user_viewable": true, "user_editable": true, - "rules": "required|string|max:20", + "rules": "required|string|in:18,20,21,lts,current", + "field_type": "text" + }, + { + "name": "SIT Mod Github Package", + "description": "Github package for the SIT Aki server co-op mod. \r\n\r\nSITCoop: https:\/\/github.com\/stayintarkov\/SIT.Aki-Server-Mod", + "env_variable": "SIT_PACKAGE", + "default_value": "stayintarkov\/SIT.Aki-Server-Mod", + "user_viewable": false, + "user_editable": false, + "rules": "required|string", + "field_type": "text" + }, + { + "name": "SIT Mod asset name", + "description": "SIT mod release file's asset name.", + "env_variable": "SIT_NAME", + "default_value": "SITCoop.zip", + "user_viewable": false, + "user_editable": false, + "rules": "required|string", + "field_type": "text" + }, + { + "name": "Github Username", + "description": "Optional, a github username to use to avoid Github API rate limit", + "env_variable": "GITHUB_USER", + "default_value": "", + "user_viewable": false, + "user_editable": true, + "rules": "present", + "field_type": "text" + }, + { + "name": "Github OAuth token", + "description": "Optional, A Github OAuth token to use to avoid API rate limit.", + "env_variable": "GITHUB_OAUTH_TOKEN", + "default_value": "", + "user_viewable": false, + "user_editable": true, + "rules": "present", "field_type": "text" } ]