From 0c1d67c358d59e6f86b6e0ccda91ef804f3ee86c Mon Sep 17 00:00:00 2001 From: Lightemerald Date: Wed, 17 Jan 2024 09:27:56 +0100 Subject: [PATCH] Fixes --- setupChoco.ps1 | 2 -- setupTmp.ps1 | 25 +++---------------------- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/setupChoco.ps1 b/setupChoco.ps1 index 16f8ece..9ec318d 100644 --- a/setupChoco.ps1 +++ b/setupChoco.ps1 @@ -38,8 +38,6 @@ function ChocoInstallApps { choco install ganttproject -y } "Laptop" { - choco install dotnet -y - choco install vcredist-all -y choco install firefox -y choco install 7zip -y choco install vlc -y diff --git a/setupTmp.ps1 b/setupTmp.ps1 index 27245d5..6176c3c 100644 --- a/setupTmp.ps1 +++ b/setupTmp.ps1 @@ -75,17 +75,12 @@ function DownloadFiles { Url = "https://git.justw.tf/Lightemerald/setup-script/raw/branch/main/Setup%20files/Anagene.zip" FileName = "Anagene.zip" Hash = "17d6a6fd898644b9b3771affa95842f0992d19cf" - } , + }, @{ Url = "https://git.justw.tf/Lightemerald/setup-script/raw/branch/main/Setup%20files/EduPython.zip" FileName = "EduPython.zip" Hash = "41cb919182beb4d0fe2ea7a91fdb94eaf9bc91cc" - } , - @{ - Url = "https://officecdn.microsoft.com/db/492350f6-3a01-4f97-b9c0-c7c6ddf67d60/media/fr-fr/O365ProPlusRetail.img" # Validated 15/11/23 - FileName = "O365ProPlusRetail.img" - Hash = "6d603e00560bb9619453d1fa1c1a5984850db6d2" - } + } ) } "Info" { @@ -104,21 +99,7 @@ function DownloadFiles { Url = "https://git.justw.tf/Lightemerald/setup-script/raw/branch/main/Setup%20files/RobotProg.zip" FileName = "RobotProg.zip" Hash = "5ed0962c5aefb5738d4408bb475655ea02e96dbb" - }, - @{ - Url = "https://officecdn.microsoft.com/db/492350f6-3a01-4f97-b9c0-c7c6ddf67d60/media/fr-fr/O365ProPlusRetail.img" # Validated 15/11/23 - FileName = "O365ProPlusRetail.img" - Hash = "6d603e00560bb9619453d1fa1c1a5984850db6d2" - } - ) - } - "Laptop" { - $filesToDownload = @( - @{ - Url = "https://officecdn.microsoft.com/db/492350f6-3a01-4f97-b9c0-c7c6ddf67d60/media/fr-fr/O365ProPlusRetail.img" # Validated 15/11/23 - FileName = "O365ProPlusRetail.img" - Hash = "6d603e00560bb9619453d1fa1c1a5984850db6d2" - } + } ) } "Office" {