From 1960182c4fc838e9763d05001844609163426a50 Mon Sep 17 00:00:00 2001
From: "Michael (Parker) Parker" <parkervcp@gmail.com>
Date: Wed, 11 Sep 2019 10:37:25 -0400
Subject: [PATCH] update install script and readme

update install script to use DOWNLOAD_URL
update the readme to have a notice due to fivem changes
---
 gta/fivem/README.md       |  8 ++++++++
 gta/fivem/egg-five-m.json | 19 ++++++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/gta/fivem/README.md b/gta/fivem/README.md
index a90c6d7e..69dd4670 100644
--- a/gta/fivem/README.md
+++ b/gta/fivem/README.md
@@ -1,5 +1,13 @@
 # FiveM 
 
+# Notice
+
+This is to inform all users that the4 fivem team has enabled cloudflare ddos protection and the install script is now broken due to this.
+
+You will need to have a self hosted version of the server files to curl in the install script.
+
+I have added a `DOWNLOAD_URL` variable that needs to point to a `fx.tar.xz` file as I am too lazy to update the entire script.
+
 ### From the [FiveM](https://fivem.net/) Site
 FiveM is a modification for Grand Theft Auto V enabling you to play multiplayer on customized dedicated servers.
 
diff --git a/gta/fivem/egg-five-m.json b/gta/fivem/egg-five-m.json
index 88584452..021533fe 100644
--- a/gta/fivem/egg-five-m.json
+++ b/gta/fivem/egg-five-m.json
@@ -3,7 +3,7 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2019-07-13T15:13:03-04:00",
+    "exported_at": "2019-09-11T10:35:51-04:00",
     "name": "FiveM",
     "author": "parker@parkervcp.com",
     "description": "A new FiveM egg for the latest builds due to recent changes in FiveM",
@@ -17,8 +17,8 @@
     },
     "scripts": {
         "installation": {
-            "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 -e \"pulling files from https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${FIVEM_VERSION}\/fx.tar.xz\"\r\nwget https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${FIVEM_VERSION}\/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.9",
+            "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 -e \"pulling files from ${DOWNLOAD_URL}\"\r\nwget ${DOWNLOAD_URL}\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.10",
             "entrypoint": "ash"
         }
     },
@@ -36,10 +36,10 @@
             "name": "Max Players",
             "description": "Set the fivem max play count",
             "env_variable": "MAX_PLAYERS",
-            "default_value": "30",
+            "default_value": "32",
             "user_viewable": 1,
             "user_editable": 0,
-            "rules": "required|integer|between:1,31"
+            "rules": "required|integer|between:1,32"
         },
         {
             "name": "Server Hostname",
@@ -58,6 +58,15 @@
             "user_viewable": 1,
             "user_editable": 0,
             "rules": "required|string|max:50"
+        },
+        {
+            "name": "Download Link",
+            "description": "This is the link to download fivem from.\r\n\r\nThis is only used in the install script.",
+            "env_variable": "DOWNLOAD_URL",
+            "default_value": "",
+            "user_viewable": 0,
+            "user_editable": 0,
+            "rules": "required|string"
         }
     ]
 }
\ No newline at end of file