Fixed bracket

This commit is contained in:
Aaron Viehl 2022-02-05 11:21:45 +01:00
parent ce01d16d82
commit 5a1e3d0b82

View File

@ -53,8 +53,8 @@ Function Invoke-OfficeUninstall {
Invoke-SaRA Invoke-SaRA
} }
} }
}
Function Invoke-SaRADownload { Function Invoke-SaRADownload {
Start-BitsTransfer -Source "$SaRA_URL" -Destination "$SaRA_ZIP" Start-BitsTransfer -Source "$SaRA_URL" -Destination "$SaRA_ZIP"
if (Test-Path "$SaRA_ZIP") { if (Test-Path "$SaRA_ZIP") {
Write-Host "Unzipping ..." Write-Host "Unzipping ..."
@ -70,9 +70,9 @@ Function Invoke-OfficeUninstall {
} }
} }
} }
} }
Function Remove-SaRA { Function Remove-SaRA {
if (Test-Path "$SaRA_ZIP") { if (Test-Path "$SaRA_ZIP") {
Remove-Item "$SaRA_ZIP" -Force Remove-Item "$SaRA_ZIP" -Force
} }
@ -80,9 +80,9 @@ Function Invoke-OfficeUninstall {
if (Test-Path "$SaRA_DIR") { if (Test-Path "$SaRA_DIR") {
Remove-Item "$SaRA_DIR" -Recurse -Force Remove-Item "$SaRA_DIR" -Recurse -Force
} }
} }
Function Stop-OfficeProcess { Function Stop-OfficeProcess {
Write-Host "Stopping running Office applications ..." Write-Host "Stopping running Office applications ..."
$OfficeProcessesArray = "lync", "winword", "excel", "msaccess", "mstore", "infopath", "setlang", "msouc", "ois", "onenote", "outlook", "powerpnt", "mspub", "groove", "visio", "winproj", "graph", "teams" $OfficeProcessesArray = "lync", "winword", "excel", "msaccess", "mstore", "infopath", "setlang", "msouc", "ois", "onenote", "outlook", "powerpnt", "mspub", "groove", "visio", "winproj", "graph", "teams"
foreach ($ProcessName in $OfficeProcessesArray) { foreach ($ProcessName in $OfficeProcessesArray) {
@ -95,9 +95,9 @@ Function Invoke-OfficeUninstall {
} }
} }
} }
} }
Function Invoke-SaRA { Function Invoke-SaRA {
$SaRAProcess = Start-Process -FilePath "$SaRA_EXE" -ArgumentList "-S OfficeScrubScenario -AcceptEula" -Wait -PassThru -NoNewWindow $SaRAProcess = Start-Process -FilePath "$SaRA_EXE" -ArgumentList "-S OfficeScrubScenario -AcceptEula" -Wait -PassThru -NoNewWindow
switch ($SaRAProcess.ExitCode) { switch ($SaRAProcess.ExitCode) {
0 { 0 {
@ -120,9 +120,9 @@ Function Invoke-OfficeUninstall {
Exit 3 Exit 3
} }
} }
} }
Function Invoke-SetupOffice365($Office365ConfigFile) { Function Invoke-SetupOffice365($Office365ConfigFile) {
if ($InstallOffice365) { if ($InstallOffice365) {
Write-Host "Downloading Office365 Installer ..." Write-Host "Downloading Office365 Installer ..."
Start-BitsTransfer -Source "$Office365Setup_URL\setup.exe" -Destination "$SaRA_DIR\setup.exe" Start-BitsTransfer -Source "$Office365Setup_URL\setup.exe" -Destination "$SaRA_DIR\setup.exe"
@ -141,26 +141,26 @@ Function Invoke-OfficeUninstall {
} }
} }
} }
} }
Function Invoke-Reboot { Function Invoke-Reboot {
if (-not $SupressReboot) { if (-not $SupressReboot) {
Start-Process -FilePath "$env:SystemRoot\system32\shutdown.exe" -ArgumentList "/r /c `"Reboot needed. System will reboot in 60 seconds.`" /t 60 /f /d p:4:1" Start-Process -FilePath "$env:SystemRoot\system32\shutdown.exe" -ArgumentList "/r /c `"Reboot needed. System will reboot in 60 seconds.`" /t 60 /f /d p:4:1"
} }
} }
#-----------------------------------------------------------[Execution]------------------------------------------------------------ #-----------------------------------------------------------[Execution]------------------------------------------------------------
Write-Host " ___ ___ ___ _____ _____ _____ " Write-Host " ___ ___ ___ _____ _____ _____ "
Write-Host "|_ | | |_ | | __| __| |" Write-Host "|_ | | |_ | | __| __| |"
Write-Host " _| |_| | |_| |_ | __| __| | | |" Write-Host " _| |_| | |_| |_ | __| __| | | |"
Write-Host "|_____|___|_____| |__| |__| |_|_|_|" Write-Host "|_____|___|_____| |__| |__| |_|_|_|"
Write-Host "" Write-Host ""
Write-Host "Microsoft Office Removal Tool" Write-Host "Microsoft Office Removal Tool"
Write-Host "by Aaron Viehl (101 Frankfurt)" Write-Host "by Aaron Viehl (101 Frankfurt)"
Write-Host "einsnulleins.de" Write-Host "einsnulleins.de"
Write-Host "" Write-Host ""
Stop-OfficeProcess Stop-OfficeProcess
Invoke-OfficeUninstall Invoke-OfficeUninstall
Invoke-SetupOffice365 "$Office365Setup_URL\upgrade.xml" Invoke-SetupOffice365 "$Office365Setup_URL\upgrade.xml"
Invoke-Reboot Invoke-Reboot