From 8bf4bef4fa788252d8e55b9f496cf2fcf3135de5 Mon Sep 17 00:00:00 2001
From: Greelan <53196309+Greelan@users.noreply.github.com>
Date: Wed, 14 Sep 2022 10:05:25 +1000
Subject: [PATCH] Clean up update stages (#186)

---
 veloren.kvp         |  4 +--
 velorenupdates.json | 60 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 velorenupdates.json

diff --git a/veloren.kvp b/veloren.kvp
index ccd855c..ac987c0 100644
--- a/veloren.kvp
+++ b/veloren.kvp
@@ -9,7 +9,7 @@ Meta.EndpointURIFormat=
 Meta.ConfigManifest=velorenconfig.json
 Meta.MetaConfigManifest=velorenmetaconfig.json
 Meta.ConfigRoot=veloren.kvp
-Meta.MinAMPVersion=2.3.4.3
+Meta.MinAMPVersion=2.4.0.2
 Meta.SpecificDockerImage=
 Meta.DockerRequired=False
 Meta.ContainerPolicy=Supported
@@ -54,7 +54,7 @@ App.RCONConnectRetrySeconds=5
 App.RCONHeartbeatMinutes=0
 App.RCONHeartbeatCommand=ping
 App.TelnetLoginFormat={0}
-App.UpdateSources=[{"UpdateStageName":"Server Download","UpdateSourcePlatform":"Windows","UpdateSource":"FetchURL","UpdateSourceData":"https://download.veloren.net/latest/windows/x86_64/nightly","UpdateSourceTarget":"{{$FullRootDir}}","UnzipUpdateSource":false,"OverwriteExistingFiles":true,"DeleteAfterExtract":false},{"UpdateStageName":"Server Download","UpdateSourcePlatform":"Linux","UpdateSource":"FetchURL","UpdateSourceData":"https://download.veloren.net/latest/linux/x86_64/nightly","UpdateSourceTarget":"{{$FullRootDir}}","UnzipUpdateSource":false,"OverwriteExistingFiles":true,"DeleteAfterExtract":false},{"UpdateStageName":"Server Download Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"{{$FullInstanceDir}}nightly.zip","UpdateSourceArgs":"{{$FullRootDir}}nightly","OverwriteExistingFiles":true},{"UpdateStageName":"Server Extract","UpdateSourcePlatform":"All","UpdateSource":"ExtractArchive","UpdateSourceArgs":"{{$FullInstanceDir}}nightly.zip","UpdateSourceTarget":"{{$FullRootDir}}","OverwriteExistingFiles":true,"DeleteAfterExtract":true},{"UpdateStageName":"Set Executable Flag","UpdateSourcePlatform":"Linux","UpdateSource":"SetExecutableFlag","UpdateSourceArgs":"{{$FullRootDir}}veloren-server-cli"},{"UpdateStageName":"Settings Template Download","UpdateSourcePlatform":"All","UpdateSource":"FetchURL","UpdateSourceData":"https://raw.githubusercontent.com/CubeCoders/AMPTemplates/main/velorensettings.ron","UpdateSourceTarget":"{{$FullInstanceDir}}","OverwriteExistingFiles":true},{"UpdateStageName":"Config Directory Creation","UpdateSourcePlatform":"All","UpdateSource":"CreateDirectory","UpdateSourceArgs":"{{$FullBaseDir}}userdata/server/server_config"},{"UpdateStageName":"Settings Template Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"{{$FullBaseDir}}userdata/server/server_config/AMP_settings.ron","UpdateSourceArgs":"{{$FullInstanceDir}}velorensettings.ron","OverwriteExistingFiles":false}]
+App.UpdateSources=@IncludeJson[velorenupdates.json]
 App.Compatibility=None
 App.SteamUpdateAnonymousLogin=True
 App.SteamForceLoginPrompt=False
diff --git a/velorenupdates.json b/velorenupdates.json
new file mode 100644
index 0000000..d24198b
--- /dev/null
+++ b/velorenupdates.json
@@ -0,0 +1,60 @@
+[
+    {
+        "UpdateStageName":"Server Download",
+        "UpdateSourcePlatform":"Windows",
+        "UpdateSource":"FetchURL",
+        "UpdateSourceData":"https://download.veloren.net/latest/windows/x86_64/nightly",
+        "UpdateSourceArgs":"nightly.zip",
+        "UpdateSourceTarget":"{{$FullRootDir}}",
+        "UnzipUpdateSource":true,
+        "OverwriteExistingFiles":true,
+        "DeleteAfterExtract":true
+    },
+    {
+        "UpdateStageName":"Server Download",
+        "UpdateSourcePlatform":"Linux",
+        "UpdateSource":"FetchURL",
+        "UpdateSourceData":"https://download.veloren.net/latest/linux/x86_64/nightly",
+        "UpdateSourceArgs":"nightly.zip",
+        "UpdateSourceTarget":"{{$FullRootDir}}",
+        "UnzipUpdateSource":true,
+        "OverwriteExistingFiles":true,
+        "DeleteAfterExtract":true
+    },
+    {
+        "UpdateStageName":"Set Executable Flag",
+        "UpdateSourcePlatform":"Linux",
+        "UpdateSource":"SetExecutableFlag",
+        "UpdateSourceArgs":"{{$FullRootDir}}veloren-server-cli"
+    },
+    {
+        "UpdateStageName":"Config Directory Creation",
+        "UpdateSourcePlatform":"All",
+        "UpdateSource":"CreateDirectory",
+        "UpdateSourceArgs":"{{$FullBaseDir}}userdata/server/server_config"
+    },
+    {
+        "UpdateStageName":"Settings Template Download",
+        "UpdateSourcePlatform":"All",
+        "UpdateSource":"FetchURL",
+        "UpdateSourceData":"https://raw.githubusercontent.com/CubeCoders/AMPTemplates/main/velorensettings.ron",
+        "UpdateSourceArgs":"AMP_settings.ron",
+        "UpdateSourceTarget":"{{$FullBaseDir}}userdata/server/server_config/",
+        "OverwriteExistingFiles":false
+    },
+    {
+        "UpdateStageName":"Start Server",
+        "UpdateSourcePlatform":"All",
+        "UpdateSource":"StartApplication"
+    },
+    {
+        "UpdateStageName":"Wait For Server Start",
+        "UpdateSourcePlatform":"All",
+        "UpdateSource":"WaitForStartupComplete"
+    },
+    {
+        "UpdateStageName":"Stop Server",
+        "UpdateSourcePlatform":"All",
+        "UpdateSource":"ShutdownApplication"
+    }
+]
\ No newline at end of file