From 19736d957dcceeb6c2bb5e902d4ea2d55cbcea06 Mon Sep 17 00:00:00 2001 From: Matthew Miles Date: Fri, 26 Jan 2024 10:00:17 -0600 Subject: [PATCH] 24.1.26.1 --- functions/oobeFunctions.ps1 | 14 +++++++++++--- subdomains/osd.sight-sound.dev.ps1 | 4 ++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/functions/oobeFunctions.ps1 b/functions/oobeFunctions.ps1 index b24653d..f74a2f3 100644 --- a/functions/oobeFunctions.ps1 +++ b/functions/oobeFunctions.ps1 @@ -1,7 +1,7 @@ [CmdletBinding()] param() $ScriptName = 'oobeFunctions.sight-sound.dev' -$ScriptVersion = '24.1.25.1' +$ScriptVersion = '24.1.26.1' #region Initialize if ($env:SystemDrive -eq 'X:') { @@ -389,6 +389,11 @@ function Step-InstallM365Apps { Write-Host -ForegroundColor Green "[+] M365 Applications Installed" return } + $skyppedPath = "c:\osdcloud\scripts\m365appinstallskipped.txt" + if (test-path $skyppedPath) { + Write-Host -ForegroundColor Cyan "[!] Installation of M365 office applications skipped." + return + } # Display a pop-up asking for user confirmation $caption = "Install M365 Apps?" $message = "Would you like to install the M365 Office Applications?" @@ -397,13 +402,16 @@ function Step-InstallM365Apps { if ($result -eq [System.Windows.Forms.DialogResult]::Yes) { Write-Host -ForegroundColor Yellow "[-] Installing M365 Applications" + winget install microsoft.office --exact --accept-source-agreements --accept-package-agreements --override "/configure https://raw.githubusercontent.com/sightsoundtheatres/osd/main/supportFiles/MicrosoftOffice/configuration.xml" + # Download the script - Invoke-WebRequest -Uri https://raw.githubusercontent.com/sightsoundtheatres/osd/main/functions/InstallM365Apps.ps1 -OutFile $scriptPath + #Invoke-WebRequest -Uri https://raw.githubusercontent.com/sightsoundtheatres/osd/main/functions/InstallM365Apps.ps1 -OutFile $scriptPath # Execute the script - & $scriptPath -XMLURL "https://ssintunedata.blob.core.windows.net/m365/configuration.xml" -ErrorAction SilentlyContinue + #& $scriptPath -XMLURL "https://ssintunedata.blob.core.windows.net/m365/configuration.xml" -ErrorAction SilentlyContinue } else { Write-Host -ForegroundColor Cyan "[!] Installation of M365 office applications skipped." + New-Item -ItemType File -Path $skyppedPath | Out-Null return } } diff --git a/subdomains/osd.sight-sound.dev.ps1 b/subdomains/osd.sight-sound.dev.ps1 index 3117eb8..1b5abfb 100644 --- a/subdomains/osd.sight-sound.dev.ps1 +++ b/subdomains/osd.sight-sound.dev.ps1 @@ -31,7 +31,7 @@ powershell iex (irm osd.sight-sound.dev) [CmdletBinding()] param() $ScriptName = 'osd.sight-sound.dev' -$ScriptVersion = '24.1.25.1' +$ScriptVersion = '24.1.26.1' #region Initialize $Transcript = "$((Get-Date).ToString('yyyy-MM-dd-HHmmss'))-$ScriptName.log" @@ -97,7 +97,7 @@ if ($WindowsPhase -eq 'AuditMode') { #region OOBE if ($WindowsPhase -eq 'OOBE') { #Load everything needed to setup a new computer and register to AutoPilot - osdcloud-StartOOBE -InstallWinGet -WinGetUpgrade -WinGetPwsh + osdcloud-StartOOBE -InstallWinGet -WinGetUpgrade Step-installCiscoRootCert Step-InstallM365Apps Step-oobeDellDCU