From 48a92340815b416fc9ce919b6869c0e529a39a5a Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Wed, 12 Jul 2023 18:05:38 +0200
Subject: [PATCH] Reorder steps of windows restoration

---
 scripts/Windows/Collections/Personal.ps1 | 2 --
 scripts/Windows/OS/Manage.ps1            | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/Windows/Collections/Personal.ps1 b/scripts/Windows/Collections/Personal.ps1
index c57d8612..774da8a7 100644
--- a/scripts/Windows/Collections/Personal.ps1
+++ b/scripts/Windows/Collections/Personal.ps1
@@ -2,7 +2,6 @@
 . "$PSScriptRoot/../Software/git/Manage.ps1";
 . "$PSScriptRoot/../Software/LGHub/Manage.ps1";
 . "$PSScriptRoot/../Software/ManiaPlanet/Manage.ps1";
-. "$PSScriptRoot/../Software/Nextcloud/Manage.ps1";
 . "$PSScriptRoot/../Software/osu!/Manage.ps1";
 . "$PSScriptRoot/../Software/osu!lazer/Manage.ps1";
 . "$PSScriptRoot/../Software/PuTTY/Manage.ps1";
@@ -29,7 +28,6 @@ function Backup-PersonalApps([Context] $context) {
 function Restore-PersonalApps([Context] $context) {
     choco feature enable -n useEnhancedExitCodes;
     choco install -y firefox;
-    Restore-Nextcloud $context;
     Restore-Git $context;
     Restore-LogitechGHUB $context;
     Restore-TmNations $context;
diff --git a/scripts/Windows/OS/Manage.ps1 b/scripts/Windows/OS/Manage.ps1
index de2c873e..20224e80 100644
--- a/scripts/Windows/OS/Manage.ps1
+++ b/scripts/Windows/OS/Manage.ps1
@@ -1,5 +1,6 @@
 . "$PSScriptRoot/../Scripts/Context.ps1";
 . "$PSScriptRoot/../Scripts/PersonalFiles.ps1";
+. "$PSScriptRoot/../Software/Nextcloud/Manage.ps1";
 . "$PSScriptRoot/../Collections/Personal.ps1";
 
 function Backup-WindowsInstallation([Context] $context) {
@@ -28,6 +29,8 @@ function Restore-WindowsInstallation([Context] $context) {
         }
     }
 
+    Restore-Nextcloud $context;
+
     Write-Information "Determining Backup Archive Path";
     $backupPath = Read-Path;
     $context.BackupName ??= "PortValhalla";