From f135727dc2f4593b2208ace9874be3ff84f2a490 Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Tue, 25 Jul 2023 18:52:03 +0200
Subject: [PATCH] Set default programs before creating user

---
 scripts/Windows/Collections/Personal.ps1         | 7 +++----
 scripts/Windows/OS/Install.ps1                   | 2 ++
 scripts/Windows/Software/Thunderbird/Install.ps1 | 8 --------
 scripts/Windows/Software/WinSCP/Install.ps1      | 8 --------
 4 files changed, 5 insertions(+), 20 deletions(-)
 delete mode 100644 scripts/Windows/Software/Thunderbird/Install.ps1
 delete mode 100644 scripts/Windows/Software/WinSCP/Install.ps1

diff --git a/scripts/Windows/Collections/Personal.ps1 b/scripts/Windows/Collections/Personal.ps1
index dc024dae..866b0a14 100644
--- a/scripts/Windows/Collections/Personal.ps1
+++ b/scripts/Windows/Collections/Personal.ps1
@@ -90,6 +90,7 @@ function Restore-PersonalApps([Context] $context) {
         gpu-z `
         windirstat `
         winmerge `
+        winscp `
         xmedia-recode `
         hwmonitor `
         qbittorrent `
@@ -97,10 +98,8 @@ function Restore-PersonalApps([Context] $context) {
         inkscape `
         krita `
         obs-studio `
-        openvpn;
-
-    . "$PSScriptRoot/../Software/WinSCP/Install.ps1" $context;
-    . "$PSScriptRoot/../Software/Thunderbird/Install.ps1" $context;
+        openvpn `
+        thunderbird;
 
     $context.RemoveDesktopIcon("GPU-Z*");
     $context.RemoveDesktopIcon("WinDirStat*");
diff --git a/scripts/Windows/OS/Install.ps1 b/scripts/Windows/OS/Install.ps1
index 5d2825bb..d8501de2 100644
--- a/scripts/Windows/OS/Install.ps1
+++ b/scripts/Windows/OS/Install.ps1
@@ -16,6 +16,8 @@ function Invoke-WindowsInstallation([Context] $context)
         . "$configPath/Explorer/Install.ps1" $context;
         . "$configPath/OpenSSH/Install.ps1" $context;
         . "$configPath/chocolatey/Install.ps1";
+        . "$configPath/WinSCP/Install.ps1" $context;
+        . "$configPath/Thunderbird/Install.ps1" $context;
 
         $context.RemoveDesktopIcon("*Microsoft Edge*");
         $context.Set("InitialConfiguration", 1, "DWord");
diff --git a/scripts/Windows/Software/Thunderbird/Install.ps1 b/scripts/Windows/Software/Thunderbird/Install.ps1
deleted file mode 100644
index 8b479b3f..00000000
--- a/scripts/Windows/Software/Thunderbird/Install.ps1
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/pwsh
-param($context)
-
-. "$PSScriptRoot/../../Scripts/Context.ps1";
-[Context] $context = $context;
-
-choco install -y thunderbird;
-. "$PSScriptRoot/../../Config/Thunderbird/Install.ps1" $context;
diff --git a/scripts/Windows/Software/WinSCP/Install.ps1 b/scripts/Windows/Software/WinSCP/Install.ps1
deleted file mode 100644
index dcaaa75b..00000000
--- a/scripts/Windows/Software/WinSCP/Install.ps1
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/pwsh
-param($context);
-
-. "$PSScriptRoot/../../Scripts/Context.ps1";
-[Context] $context = $context;
-
-choco install -y winscp;
-. "$PSScriptRoot/../../Config/WinSCP/Install.ps1" $context;