Merge branch 'master' of https://github.com/parkervcp/eggs

# Conflicts:
#	Factorio/factorio/egg-factorio.json

Factorio/factorio/egg-factorio.json

@@ -3,7 +3,11 @@
     "meta": {
         "version": "PTDL_v1"
     },
+<<<<<<< HEAD
     "exported_at": "2018-05-26T14:21:49+01:00",
+=======
+    "exported_at": "2018-05-27T23:24:15-04:00",
+>>>>>>> 4cc093031372bdf930226de3ff4bb4f81c8a7cf6
     "name": "Factorio",
     "author": "parker@parkervcp.com",
     "description": "The vanilla Factorio server.\r\n\r\nhttps:\/\/www.factorio.com\/",
@@ -17,7 +21,11 @@
     },
     "scripts": {
         "installation": {
+<<<<<<< HEAD
             "script": "#!\/bin\/ash\r\n# Factorio Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache curl tar xz\r\n\r\nlatest_stable=`curl -s https:\/\/updater.factorio.com\/get-available-versions | sed -e 's\/},{\/}\\n{\/g' | grep stable | grep -o -E '([0-9]\\.[0-9][0-9]\\.[0-9][0-9]|[0-9]\\.[0-9][0-9]\\.[0-9])'`\r\nlatest_experimental=`curl -s https:\/\/www.factorio.com\/download-headless\/experimental | grep -m 1 -o -E '([0-9]\\.[0-9][0-9]\\.[0-9][0-9]|[0-9]\\.[0-9][0-9]\\.[0-9])'`\r\n\r\nif [ -z \"${FACTORIO_VERSION}\" ] || [ \"${FACTORIO_VERSION}\" == \"latest\" ]; then\r\n  DL_VERSION=$latest_stable\r\nelif [ \"${FACTORIO_VERSION}\" == \"experimental\" ]; then\r\n  DL_VERSION=$latest_experimental\r\nelse\r\n  DL_VERSION=${FACTORIO_VERSION}\r\nfi\r\n\r\necho -e \"\\n running 'curl -L https:\/\/www.factorio.com\/get-download\/${DL_VERSION}\/headless\/linux64 -o factorio-${DL_VERSION}.tar.gz' \\n\"\r\n\r\ncd \/mnt\/server\r\n\r\ncurl -L https:\/\/www.factorio.com\/get-download\/${DL_VERSION}\/headless\/linux64 -o factorio-${DL_VERSION}.tar.gz\r\n\r\ntar -xf factorio-${DL_VERSION}.tar.gz --strip-components=1 -C \/mnt\/server\r\n\r\nrm factorio-${DL_VERSION}.tar.gz\r\n\r\nif [ -e data\/map-gen-settings.json ]; then\r\n    echo \"map-gen exists\"\r\nelse\r\n    echo \"copying map-gen default settings\"\r\n    mv data\/map-gen-settings.example.json data\/map-gen-settings.json\r\nfi\r\n\r\nif [ -e data\/server-settings.json ]; then\r\n    echo \"server settings exists\"\r\nelse\r\n    echo \"copying server default settings\"\r\n    mv data\/server-settings.example.json data\/server-settings.json\r\nfi\r\n\r\nif [ -e map-settings.json ]; then\r\n    echo \"map settings exists\"\r\nelse\r\n    echo \"copying map default settings\"\r\n    mv data\/map-settings.example.json data\/map-settings.json\r\nfi\r\n\r\nif [ -e ${SAVE_NAME}.zip ]; then\r\n    echo \"save file exists\"\r\nelse\r\n    .\/bin\/x64\/factorio --create ${SAVE_NAME}\r\n    chmod o+w ${SAVE_NAME}.zip\r\nfi",
+=======
+            "script": "#!\/bin\/ash\r\n# Factorio Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache curl tar xz jq\r\n\r\nlatest_stable=`curl -s https:\/\/updater.factorio.com\/get-available-versions | jq '.[\"core-linux_headless64\"] | .[length-1] | .[\"stable\"]' | sed -e 's\/\"\/\/g'`\r\nlatest_experimental=`curl -s https:\/\/www.factorio.com\/download-headless\/experimental | grep -m 1 -o -E '([0-9]\\.[0-9][0-9]\\.[0-9][0-9] | [0-9]\\.[0-9][0-9]\\.[0-9])'`\r\n\r\nif [ -z \"${FACTORIO_VERSION}\" ] || [ \"${FACTORIO_VERSION}\" == \"latest\" ]; then\r\n  DL_VERSION=$latest_stable\r\nelif [ \"${FACTORIO_VERSION}\" == \"experimental\" ]; then\r\n  DL_VERSION=$latest_experimental\r\nelse\r\n  DL_VERSION=${FACTORIO_VERSION}\r\nfi\r\n\r\necho -e \"\\n running 'curl -L https:\/\/www.factorio.com\/get-download\/${DL_VERSION}\/headless\/linux64 -o factorio-${DL_VERSION}.tar.gz' \\n\"\r\n\r\ncd \/mnt\/server\r\n\r\ncurl -L https:\/\/www.factorio.com\/get-download\/${DL_VERSION}\/headless\/linux64 -o factorio-${DL_VERSION}.tar.gz\r\n\r\ntar -xf factorio-${DL_VERSION}.tar.gz --strip-components=1 -C \/mnt\/server\r\n\r\nrm factorio-${DL_VERSION}.tar.gz\r\n\r\nif [ -e data\/map-gen-settings.json ]; then\r\n    echo \"map-gen exists\"\r\nelse\r\n    echo \"copying map-gen default settings\"\r\n    mv data\/map-gen-settings.example.json data\/map-gen-settings.json\r\nfi\r\n\r\nif [ -e data\/server-settings.json ]; then\r\n    echo \"server settings exists\"\r\nelse\r\n    echo \"copying server default settings\"\r\n    mv data\/server-settings.example.json data\/server-settings.json\r\nfi\r\n\r\nif [ -e map-settings.json ]; then\r\n    echo \"map settings exists\"\r\nelse\r\n    echo \"copying map default settings\"\r\n    mv data\/map-settings.example.json data\/map-settings.json\r\nfi\r\n\r\nif [ -e ${SAVE_NAME}.zip ]; then\r\n    echo \"save file exists\"\r\nelse\r\n    .\/bin\/x64\/factorio --create ${SAVE_NAME}\r\n    chmod o+w ${SAVE_NAME}.zip\r\nfi",
+>>>>>>> 4cc093031372bdf930226de3ff4bb4f81c8a7cf6
             "container": "frolvlad\/alpine-glibc",
             "entrypoint": "ash"
         }

GTA/FiveM/egg-five-m.json

@@ -3,21 +3,21 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2018-05-02T09:38:32-04:00",
+    "exported_at": "2018-06-02T03:22:00-04:00",
     "name": "FiveM",
     "author": "parker@parkervcp.com",
-    "description": "The FiveM multiplayer server on Pterodactyl.",
+    "description": "A new FiveM egg for the latest builds due to recent changes in FiveM",
-    "image": "quay.io\/pterodactyl\/core:glibc",
+    "image": "quay.io\/parkervcp\/pterodactyl-images:alpine",
-    "startup": ".\/cfx-server\/FXServer +exec server.cfg +set sv_licenseKey {{FIVEM_LICENSE}} +set citizen_dir \/home\/container\/cfx-server\/citizen",
+    "startup": "$(pwd)\/alpine\/opt\/cfx-server\/ld-musl-x86_64.so.1 --library-path \"$(pwd)\/alpine\/usr\/lib\/v8\/:$(pwd)\/alpine\/lib\/:$(pwd)\/alpine\/usr\/lib\/\" -- $(pwd)\/alpine\/opt\/cfx-server\/FXServer +set citizen_dir $(pwd)\/alpine\/opt\/cfx-server\/citizen\/ +set sv_licenseKey {{FIVEM_LICENSE}} +set sv_maxplayers {{MAX_PLAYERS}} +exec server.cfg",
     "config": {
-        "files": "{\r\n    \"server.cfg\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"endpoint_add_tcp\": \"endpoint_add_tcp \\\"0.0.0.0:{{server.build.default.port}}\\\"\",\r\n            \"endpoint_add_udp\": \"endpoint_add_udp \\\"0.0.0.0:{{server.build.default.port}}\\\"\"\r\n        }\r\n    }\r\n}",
+        "files": "{\r\n    \"server.cfg\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"endpoint_add_tcp\": \"endpoint_add_tcp \\\"0.0.0.0:{{server.build.default.port}}\\\"\",\r\n            \"endpoint_add_udp\": \"endpoint_add_udp \\\"0.0.0.0:{{server.build.default.port}}\\\"\",\r\n            \"sv_hostname\": \"sv_hostname \\\"{{server.build.env.SERVER_HOSTNAME}}\\\"\",\r\n            \"sv_maxclients\": \"sv_maxclients {{server.build.env.MAX_PLAYERS}}\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \"Server license key authentication succeeded. Welcome!\"\r\n}",
         "logs": "{\r\n    \"custom\": true,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
         "stop": "^C"
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/ash\r\n# FiveM Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n## Only download if a path is provided, otherwise continue.\r\napk add openssl tar xz curl git --no-cache\r\n\r\necho \"cloning citizenfx files\"\r\n\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/mnt\/server\/\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Downloading the latest fivem server files\"\r\nlatest_fivem_url=`curl https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/ | tail -3 | head -1 | cut -d'\"' -f2`\r\n\r\necho -e \"pulling files from https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${latest_fivem_url}fx.tar.xz\"\r\nwget https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${latest_fivem_url}fx.tar.xz\r\n\r\necho \"Extracting fivem files\"\r\n\r\ntar xf fx.tar.xz alpine\/opt\/\r\n\r\nmv -fin alpine\/opt\/cfx-server\/ .\/\r\n\r\nchmod +x .\/cfx-server\/FXServer\r\n\r\nrm -rf fx.tar.xz alpine\/\r\n\r\nif [ -e server.cfg ]; then\r\n    echo \"server config file exists\"\r\nelse\r\n    echo \"Downloading default fivem config\"\r\n    curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/GTA\/FiveM\/server.cfg >> server.cfg\r\nfi\r\n\r\necho \"install complete\"\r\n\r\nexit 0",
+            "script": "#!\/bin\/ash \r\n\r\napk add openssl tar xz curl wget git --no-cache\r\n\r\ncd \/mnt\/server\r\n\r\nmkdir resources\r\n\r\necho \"updating citizenfx resource files\"\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/tmp\r\ncp -Rf \/tmp\/resources\/* resources\/ \r\n\r\ncd \/mnt\/server\r\n\r\necho \"Downloading the latest fivem server files\"\r\nlatest_fivem_url=`curl https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/ | tail -4 | head -1 | cut -d'\"' -f2`\r\n\r\necho -e \"pulling files from https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${latest_fivem_url}fx.tar.xz\"\r\nwget https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${latest_fivem_url}fx.tar.xz\r\n\r\necho \"Extracting fivem files\"\r\n\r\ntar xf fx.tar.xz\r\n\r\nrm -rf fx.tar.xz run.sh\r\n\r\nif [ -e server.cfg ]; then\r\n    echo \"server config file exists\"\r\nelse\r\n    echo \"Downloading default fivem config\"\r\n    curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/GTA\/FiveM\/server.cfg >> server.cfg\r\nfi\r\n\r\nmkdir logs\/\r\n\r\necho \"install complete\"",
             "container": "alpine:3.7",
             "entrypoint": "ash"
         }
@@ -31,6 +31,24 @@
             "user_viewable": 1,
             "user_editable": 1,
             "rules": "required|string|max:32"
+        },
+        {
+            "name": "Max Players",
+            "description": "Set the fivem max play count",
+            "env_variable": "MAX_PLAYERS",
+            "default_value": "30",
+            "user_viewable": 1,
+            "user_editable": 0,
+            "rules": "required|integer|between:1,31"
+        },
+        {
+            "name": "Server Hostname",
+            "description": "The name that shows up in the server browser",
+            "env_variable": "SERVER_HOSTNAME",
+            "default_value": "My new FXServer!",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:32"
         }
     ]
 }

GTA/FiveM/server.cfg

@@ -1,5 +1,4 @@
-# you probably don't want to change these!
+# only change these if you're using a server with multiple network interfaces
-# only change them if you're using a server with multiple network interfaces
 endpoint_add_tcp "0.0.0.0:30120"
 endpoint_add_udp "0.0.0.0:30120"
 
@@ -13,11 +12,16 @@ start rconlog
 start scoreboard
 start playernames
 
+# allow client mods such as Lamda Menu?
 sv_scriptHookAllowed 1
 
 # change this
 #rcon_password yay
 
+# a comma-separated list of tags for your server
+# for example: sets tags "drifting, cars, racing" or sets tags "roleplay, military, tanks"
+sets tags "default"
+
 sv_hostname "My new FXServer!"
 
 # nested configs!
@@ -29,10 +33,10 @@ sv_hostname "My new FXServer!"
 # convars for use from script
 set temp_convar "hey world!"
 
-# disable announcing? clear out the master by uncommenting this
+# Uncomment to DISABLE your server coming up in the server list
 #sv_master1 ""
 
-# want to only allow players authenticated with a third-party provider like Steam?
+# want to only allow players authenticated with a third-party provider like Steam (don't forget, Social Club is a third party provider too!)?
 #sv_authMaxVariance 1
 #sv_authMinTrust 5
 
@@ -44,5 +48,5 @@ add_principal identifier.steam:110000112345678 group.admin # add the admin to th
 # remove the # to hide player endpoints in external log output
 #sv_endpointprivacy true
 
-# server slots limit (must be between 1 and 31)
+# server slots limit (must be between 1 and 32)
-sv_maxclients 30
+sv_maxclients 32

GTA/RageMP/conf.json

@@ -0,0 +1,9 @@
+{
+    "announce": false,
+    "bind": "0.0.0.0",
+    "gamemode": "freeroam",
+    "name": "RAGE:MP Unofficial server",
+    "maxplayers": 100,
+    "port": 26011,
+    "streamdistance": 500
+}

GTA/RageMP/egg-rage--m-p.json

@@ -0,0 +1,54 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1"
+    },
+    "exported_at": "2018-06-03T00:48:50-04:00",
+    "name": "Rage.MP",
+    "author": "noreply.waypointhosting@gmail.com",
+    "description": "https:\/\/rage.mp\/\r\n\r\nThis server requires 2 ports to be added for the server. the main port and the next (port+1) as ports for the server.",
+    "image": "quay.io\/pterodactyl\/core:glibc",
+    "startup": ".\/server",
+    "config": {
+        "files": "{\r\n    \"conf.json\": {\r\n        \"parser\": \"json\",\r\n        \"find\": {\r\n            \"bind\": \"0.0.0.0\",\r\n            \"port\": \"{{server.build.default.port}}\",\r\n            \"name\": \"{{server.build.env.SERVER_NAME}}\",\r\n            \"maxplayers\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n            \"announce\": \"{{server.build.env.ANNOUNCE}}\"\r\n        }\r\n    }\r\n}",
+        "startup": "{\r\n    \"done\": \"Started HTTP server\"\r\n}",
+        "logs": "{\r\n    \"custom\": true,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
+        "stop": "^C"
+    },
+    "scripts": {
+        "installation": {
+            "script": "apt update\r\napt -y install curl tar libstdc++6\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Downloading rage.mp\"\r\ncurl -sSL -o ragemp-srv.tar.gz https:\/\/cdn.rage.mp\/lin\/ragemp-srv.tar.gz\r\n\r\ntar -xzvf ragemp-srv.tar.gz --strip 1 -C \/mnt\/server\r\n\r\nrm ragemp-srv.tar.gz\r\n\r\nchmod +x .\/server\r\n\r\nif [ -e conf.json ]; then\r\n    echo \"server config file exists\"\r\nelse\r\n    echo \"Downloading default rage.mp config\"\r\n    curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/GTA\/RageMP\/conf.json >> conf.json\r\nfi\r\n\r\necho \"install complete\"\r\n\r\nexit 0",
+            "container": "ubuntu:16.04",
+            "entrypoint": "bash"
+        }
+    },
+    "variables": [
+        {
+            "name": "Server Name",
+            "description": "Server name that will be displayed to the master server.  (64 Char max)",
+            "env_variable": "SERVER_NAME",
+            "default_value": "RAGE:MP Unofficial server",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|max:64"
+        },
+        {
+            "name": "Max Players",
+            "description": "Maximum number of players your server will hold.  (Max 100)",
+            "env_variable": "MAX_PLAYERS",
+            "default_value": "50",
+            "user_viewable": 1,
+            "user_editable": 0,
+            "rules": "required|integer|between:1,100"
+        },
+        {
+            "name": "Announce",
+            "description": "Announce to the master server so people can see you in their server browser.",
+            "env_variable": "ANNOUNCE",
+            "default_value": "false",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|boolean"
+        }
+    ]
+}

PixARK/egg-pix-a-r-k.json

@@ -0,0 +1,90 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1"
+    },
+    "exported_at": "2018-06-07T12:39:45-04:00",
+    "name": "PixARK",
+    "author": "hello@venatus.digital",
+    "description": "A simple Docker container with Wine to run PixARK using Pterodactyl Panel",
+    "image": "quay.io\/parkervcp\/pterodactyl-images:wine-source",
+    "startup": "wine64 .\/ShooterGame\/Binaries\/Win64\/PixARKServer.exe CubeWorld_Light?listen?MaxPlayers={{MAX_PLAYERS}}?Port={{SERVER_PORT}}?QueryPort={{QPORT}}?RCONPort={{RCPORT}}?ServerPassword={{ARK_PASSWORD}}?ServerAdminPassword={{ARK_ADMIN_PASSWORD}}?CULTUREFORCOOKING=en -NoBattlEye -CubePort={{CUBEPORT}} -cubeworld=world -nosteamclient -NoHangDetection -game -server -log",
+    "config": {
+        "files": "{}",
+        "startup": "{\r\n    \"done\": \"Full Startup:\",\r\n    \"userInteraction\": []\r\n}",
+        "logs": "{\r\n    \"custom\": false,\r\n    \"location\": \"Logs\/\"\r\n}",
+        "stop": "^C"
+    },
+    "scripts": {
+        "installation": {
+            "script": "#!\/bin\/bash\r\n# PixARK: Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd\r\n\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\n\r\nexport HOME=\/mnt\/server\r\n\/mnt\/server\/steamcmd\/steamcmd.sh +@sSteamCmdForcePlatformType windows +login anonymous +force_install_dir \/home\/container +app_update {{SRCDS_APPID}} +quit",
+            "container": "ubuntu:latest",
+            "entrypoint": "bash"
+        }
+    },
+    "variables": [
+        {
+            "name": "Server Password",
+            "description": "If specified, players must provide this password to join the server.",
+            "env_variable": "ARK_PASSWORD",
+            "default_value": "",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "nullable|alpha_dash|between:1,100"
+        },
+        {
+            "name": "Admin Password",
+            "description": "If specified, players must provide this password (via the in-game console) to gain access to administrator commands on the server.",
+            "env_variable": "ARK_ADMIN_PASSWORD",
+            "default_value": "",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "nullable|alpha_dash|between:1,100"
+        },
+        {
+            "name": "Maximum Players",
+            "description": "Specifies the maximum number of players that can play on the server simultaneously.",
+            "env_variable": "MAX_PLAYERS",
+            "default_value": "10",
+            "user_viewable": 1,
+            "user_editable": 0,
+            "rules": "required|numeric|digits_between:1,4"
+        },
+        {
+            "name": "Query Port",
+            "description": "The port assigned for use as query port",
+            "env_variable": "QPORT",
+            "default_value": "",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|numeric|digits_between:1,5"
+        },
+        {
+            "name": "RCON Port",
+            "description": "The port assigned for use as RCON port",
+            "env_variable": "RCPORT",
+            "default_value": "",
+            "user_viewable": 1,
+            "user_editable": 0,
+            "rules": "required|numeric|digits_between:1,5"
+        },
+        {
+            "name": "Cube Port",
+            "description": "The port to be used for terrain",
+            "env_variable": "CUBEPORT",
+            "default_value": "",
+            "user_viewable": 1,
+            "user_editable": 0,
+            "rules": "required|numeric|digits_between:1,5"
+        },
+        {
+            "name": "App ID",
+            "description": "PixARK Source App ID",
+            "env_variable": "SRCDS_APPID",
+            "default_value": "824360",
+            "user_viewable": 0,
+            "user_editable": 0,
+            "rules": "required|numeric"
+        }
+    ]
+}

README.md

@@ -15,8 +15,16 @@ If you are submitting PR's try and keep names and titles the same.
 ## Game Eggs
 
 ### GTA
+#### GTA V
+
 #### FiveM 
 The [FiveM](https://fivem.net/) GTA 5 dedicated server
+- Only installs latest version versions are no selectable.
+
+#### Rage-MP
+The [Rage-MP](https://rage.mp/) GTA 5 dedicated server
+
+#### San Andreas
 
 #### SA:MP
 The [SA:MP](https://www.sa-mp.com/) GTA San Andreas dedicated server
@@ -62,6 +70,12 @@ Supply values to 2 variables to use
 #### Nukkit
 The [Nukkit](https://nukkit.io/) Minecraft PE server
 
+### PixARK
+#### PixARK
+The [PixARK](https://store.steampowered.com/app/593600/PixARK/) dedicated server  
+More info at [gamepedia](https://pixark.gamepedia.com/Pixark)
+- As a note this uses the new wine-source image and may not perform up to standard
+
 ### Squad
 #### Squad Dedicated
 The [Squad](https://joinsquad.com/) official dedicated server
@@ -74,14 +88,15 @@ The [xonotic](http://www.xonotic.org/) official dedicated server.
 ## Bot Eggs
 ### Discord
 
-#### ATLBot
+#### ATLBot - NodeJS
 The [ATLauncher Bot](https://github.com/ATLauncher/discord-bot/)
 
-#### parkertron
+#### parkertron - Golang (custom image)
-My own stupid chat bot [parkertron](https://github.com/parkervcp/parkertron)
+My own chat bot [parkertron](https://github.com/parkervcp/parkertron)
  - Currently runs as the SupportBot in the pterodactyl discord server.
+ - Requires you to set up the yaml fils before it can start properly.
 
-#### pixel-bot
+#### pixel-bot - Python
 [pixel-bot](https://github.com/Ispira/pixel-bot)
  - More of a reason/way to test a python container.
 

discordbots/Sinusbot/egg-sinusbot.json

@@ -3,7 +3,7 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2018-03-27T15:39:54+02:00",
+    "exported_at": "2018-05-23T22:18:13+02:00",
     "name": "Sinusbot",
     "author": "ki2007@damw.eu",
     "description": "Musicbot for Discord and Teamspeak.",
@@ -17,7 +17,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# Sinusbot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install ca-certificates bzip2 wget tar\r\napt -q clean all\r\n\r\n#Create needed directories\r\nmkdir -p \/mnt\/server\/TeamSpeak3-Client-linux_amd64\/plugins\r\nmkdir \/mnt\/server\/youtube-dl\r\n\r\ncd \/mnt\/server\r\n\r\n#Download Sinusbot\r\nwget -qO - https:\/\/www.sinusbot.com\/pre\/sinusbot-0.13.37-f7e9ece.tar.bz2 | tar xj\r\n\r\n#Install Sinusbot\r\nchmod +x sinusbot\r\ncp config.ini.dist config.ini\r\nsed -i \"s|^TS3Path.*|TS3Path = \\\"\/home\/container\/TeamSpeak3-Client-linux_amd64\/ts3client_linux_amd64\\\"|g\" config.ini\r\necho 'YoutubeDLPath = \"\/home\/container\/youtube-dl\/youtube-dl\"' >> config.ini\r\n#cp scripts scripts_org\r\n\r\n#Install Sinusbot plugin\r\ncp plugin\/libsoundbot_plugin.so TeamSpeak3-Client-linux_amd64\/plugins\r\n\r\n#Download TeamSpeak Client\r\nTSVERSION=$(wget -q -O - http:\/\/dl.4players.de\/ts\/releases\/ | grep -Po '(?<=href=\")[0-9]+(\\.[0-9]+){2,3}(?=\/\")' | sort -Vr | head -1)\r\nwget -q \"http:\/\/dl.4players.de\/ts\/releases\/$TSVERSION\/TeamSpeak3-Client-linux_amd64-$TSVERSION.run\"\r\n\r\n# Install TeamSpeak Client\r\nchmod +x TeamSpeak3-Client-linux_amd64-$TSVERSION.run\r\n.\/TeamSpeak3-Client-linux_amd64-$TSVERSION.run --tar xfv -C TeamSpeak3-Client-linux_amd64\r\nrm TeamSpeak3-Client-linux_amd64-$TSVERSION.run\r\n# Remove glx-integration lib\r\nrm TeamSpeak3-Client-linux_amd64\/xcbglintegrations\/libqxcb-glx-integration.so\r\n\r\n#Download youtube-dl\r\ncd \/mnt\/server\/youtube-dl\r\nwget -q https:\/\/yt-dl.org\/downloads\/latest\/youtube-dl\r\nchmod a+rx youtube-dl",
+            "script": "#!\/bin\/bash\r\n# Sinusbot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install ca-certificates bzip2 wget tar\r\napt -q clean all\r\n\r\n#Create needed directories\r\nmkdir -p \/mnt\/server\/TeamSpeak3-Client-linux_amd64\/plugins\r\nmkdir \/mnt\/server\/youtube-dl\r\n\r\ncd \/mnt\/server\r\n\r\n#Download Sinusbot\r\nwget -qO - https:\/\/www.sinusbot.com\/pre\/sinusbot-0.13.37-f7e9ece.tar.bz2 | tar xj\r\n\r\n#Install Sinusbot\r\nchmod +x sinusbot\r\ncp config.ini.dist config.ini\r\nsed -i \"s|^TS3Path.*|TS3Path = \\\"\/home\/container\/TeamSpeak3-Client-linux_amd64\/ts3client_linux_amd64\\\"|g\" config.ini\r\necho 'YoutubeDLPath = \"\/home\/container\/youtube-dl\/youtube-dl\"' >> config.ini\r\n#cp scripts scripts_org\r\n\r\n#Install Sinusbot plugin\r\ncp plugin\/libsoundbot_plugin.so TeamSpeak3-Client-linux_amd64\/plugins\r\n\r\n#Download TeamSpeak Client\r\nif [ \"_$TSVERSION\" == \"_latest\" ]; then\r\n  TSVERSION=$(wget -q -O - http:\/\/dl.4players.de\/ts\/releases\/ | grep -Po '(?<=href=\")[0-9]+(\\.[0-9]+){2,3}(?=\/\")' | sort -Vr | head -1)\r\nfi\r\nwget -q \"http:\/\/dl.4players.de\/ts\/releases\/$TSVERSION\/TeamSpeak3-Client-linux_amd64-$TSVERSION.run\"\r\n\r\n# Install TeamSpeak Client\r\nchmod +x TeamSpeak3-Client-linux_amd64-$TSVERSION.run\r\n.\/TeamSpeak3-Client-linux_amd64-$TSVERSION.run --tar xfv -C TeamSpeak3-Client-linux_amd64\r\nrm TeamSpeak3-Client-linux_amd64-$TSVERSION.run\r\n# Remove glx-integration lib\r\nrm TeamSpeak3-Client-linux_amd64\/xcbglintegrations\/libqxcb-glx-integration.so\r\n\r\n#Download youtube-dl\r\ncd \/mnt\/server\/youtube-dl\r\nwget -q https:\/\/yt-dl.org\/downloads\/latest\/youtube-dl\r\nchmod a+rx youtube-dl",
             "container": "ubuntu:16.04",
             "entrypoint": "bash"
         }
@@ -30,6 +30,15 @@
             "default_value": "CHANGEME",
             "user_viewable": 1,
             "user_editable": 1,
+            "rules": "required|string|max:256"
+        },
+        {
+            "name": "TeamSpeak Client Version",
+            "description": "Version of the TeamSpeak Client.",
+            "env_variable": "TSVERSION",
+            "default_value": "latest",
+            "user_viewable": 1,
+            "user_editable": 1,
             "rules": "required|string|max:20"
         }
     ]