From 6b06dfddc1a9a699a9a75d6a807ef547ab29a4c4 Mon Sep 17 00:00:00 2001 From: xatanu <124156556+xatanu@users.noreply.github.com> Date: Thu, 19 Oct 2023 23:09:32 +0200 Subject: [PATCH 1/5] Update Remove Edge.ps1 Fixes error out output redirection which causes the script to freeze --- .../Executables/AtlasDesktop/1. Software/Remove Edge.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/playbook/Executables/AtlasDesktop/1. Software/Remove Edge.ps1 b/src/playbook/Executables/AtlasDesktop/1. Software/Remove Edge.ps1 index 86269dc5b5..9baf3c59af 100644 --- a/src/playbook/Executables/AtlasDesktop/1. Software/Remove Edge.ps1 +++ b/src/playbook/Executables/AtlasDesktop/1. Software/Remove Edge.ps1 @@ -113,7 +113,7 @@ function RemoveEdgeChromium { $uninstallKeyPath = Join-Path -Path $baseKey -ChildPath "Windows\CurrentVersion\Uninstall\Microsoft Edge" if (Test-Path $uninstallKeyPath) { $uninstallString = (Get-ItemProperty -Path $uninstallKeyPath).UninstallString + " --force-uninstall" - Start-Process cmd.exe "/c $uninstallString" -WindowStyle Hidden | Out-Null 2> $null + Start-Process cmd.exe "/c $uninstallString" -WindowStyle Hidden 2>&1 | Out-Null } # remove user data @@ -151,7 +151,7 @@ function RemoveWebView { if (Test-Path $webviewHKLM) {$webviewUninstallKey += $webviewHKLM} foreach ($key in $webviewUninstallKey) { $webviewUninstallString = (Get-ItemProperty -Path $key).UninstallString + " --force-uninstall" - Start-Process cmd.exe "/c $webviewUninstallString" -WindowStyle Hidden | Out-Null 2> $null + Start-Process cmd.exe "/c $webviewUninstallString" -WindowStyle Hidden 2>&1 | Out-Null } } @@ -235,4 +235,4 @@ while (!($continue)) { Clear-Host UninstallAll -Completed \ No newline at end of file +Completed From 70dcef5d345749805f0db93bd0f171fb3b97d37d Mon Sep 17 00:00:00 2001 From: Xyueta <101590573+Xyueta@users.noreply.github.com> Date: Thu, 19 Oct 2023 23:36:55 +0200 Subject: [PATCH 2/5] CleanMGR --- src/playbook/Executables/CLEANUP.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/playbook/Executables/CLEANUP.ps1 b/src/playbook/Executables/CLEANUP.ps1 index 312c3627a6..c2937d0301 100644 --- a/src/playbook/Executables/CLEANUP.ps1 +++ b/src/playbook/Executables/CLEANUP.ps1 @@ -39,7 +39,7 @@ function Invoke-AtlasDiskCleanup { Set-ItemProperty -Path $path -Name 'StateFlags0064' -Value $value -Type DWORD } # Run preset 64 (0-65535) - Start-Process -FilePath "cleanmgr.exe" -ArgumentList "/sagerun:64" | Out-Null 2> $null + Start-Process -FilePath "cleanmgr.exe" -ArgumentList "/sagerun:64" 2>&1 | Out-Null } # Check for other installations of Windows From 554dac604ebed5a204f8a114b6fd5b95979ea0b9 Mon Sep 17 00:00:00 2001 From: Xyueta <101590573+Xyueta@users.noreply.github.com> Date: Thu, 19 Oct 2023 23:37:39 +0200 Subject: [PATCH 3/5] LibreWolf --- src/playbook/Executables/LIBREWOLF.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/playbook/Executables/LIBREWOLF.ps1 b/src/playbook/Executables/LIBREWOLF.ps1 index e5ab620eac..c5d3da3d0a 100644 --- a/src/playbook/Executables/LIBREWOLF.ps1 +++ b/src/playbook/Executables/LIBREWOLF.ps1 @@ -41,7 +41,7 @@ if ($NoUpdater) { } Write-Warning "Installing LibreWolf silently" -Start-Process -Wait -FilePath $outputLibrewolf -ArgumentList "/S" | Out-Null 2> $null +Start-Process -Wait -FilePath $outputLibrewolf -ArgumentList "/S" 2>&1 | Out-Null if (!(Test-Path $librewolfPath)) { Write-Host "Installing LibreWolf silently failed." exit 1 @@ -77,4 +77,4 @@ if ($NoUpdater) { Create-Shortcut -Source "$updaterPath\Librewolf-WinUpdater.exe Write-Warning "Removing temporary installer files" Remove-Item "$outputLibrewolf" -Force -if ($NoUpdater) { Remove-Item "$outputLibrewolfUpdater" -Force } \ No newline at end of file +if ($NoUpdater) { Remove-Item "$outputLibrewolfUpdater" -Force } From 0134d5107ddd4b15dd2d71b4521f877fd44224bc Mon Sep 17 00:00:00 2001 From: Xyueta <101590573+Xyueta@users.noreply.github.com> Date: Thu, 19 Oct 2023 23:38:53 +0200 Subject: [PATCH 4/5] Software --- src/playbook/Executables/SOFTWARE.ps1 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/playbook/Executables/SOFTWARE.ps1 b/src/playbook/Executables/SOFTWARE.ps1 index 05ff611a99..4773fef01f 100644 --- a/src/playbook/Executables/SOFTWARE.ps1 +++ b/src/playbook/Executables/SOFTWARE.ps1 @@ -16,7 +16,7 @@ Set-Location $tempDir if ($Chrome) { Write-Host "Installing Google Chrome..." & curl.exe -LSs "https://dl.google.com/dl/chrome/install/googlechromestandaloneenterprise64.msi" -o "$tempDir\chrome.msi" - Start-Process -FilePath "$tempDir\chrome.msi" -WindowStyle Hidden -ArgumentList '/qn' -Wait | Out-Null 2> $null + Start-Process -FilePath "$tempDir\chrome.msi" -WindowStyle Hidden -ArgumentList '/qn' -Wait 2>&1 | Out-Null exit } @@ -29,7 +29,7 @@ if ($Brave) { exit 1 } - & "$tempDir\BraveSetup.exe" /silent /install | Out-Null 2> $null + & "$tempDir\BraveSetup.exe" /silent /install 2>&1 | Out-Null do { $processesFound = Get-Process | Where-Object { "BraveSetup" -contains $_.Name } | Select-Object -ExpandProperty Name @@ -74,21 +74,21 @@ $num = 0; foreach ($a in $vcredists.GetEnumerator()) { # curl is faster than Invoke-WebRequest Write-Host "Installing Visual C++ Runtime $num..." & curl.exe -LSs "$($a.Name)" -o "$vcredist" - Start-Process -FilePath $vcredist -WindowStyle Hidden -ArgumentList $a.Value -Wait | Out-Null 2> $null + Start-Process -FilePath $vcredist -WindowStyle Hidden -ArgumentList $a.Value -Wait 2>&1 | Out-Null } # 7-Zip $website = 'https://7-zip.org/' $download = $website + ((Invoke-WebRequest $website -UseBasicParsing).Links.href | Where-Object { $_ -like "a/7z2301-x64.exe" }) & curl.exe -LSs $download -o "$tempDir\7zip.exe" -Start-Process -FilePath "$tempDir\7zip.exe" -WindowStyle Hidden -ArgumentList '/S' -Wait | Out-Null 2> $null +Start-Process -FilePath "$tempDir\7zip.exe" -WindowStyle Hidden -ArgumentList '/S' -Wait 2>&1 | Out-Null # Legacy DirectX runtimes & curl.exe -LSs "https://download.microsoft.com/download/8/4/A/84A35BF1-DAFE-4AE8-82AF-AD2AE20B6B14/directx_Jun2010_redist.exe" -o "$tempDir\directx.exe" Write-Host "Extracting legacy DirectX runtimes..." -Start-Process -FilePath "$tempDir\directx.exe" -WindowStyle Hidden -ArgumentList "/q /c /t:`"$tempDir\directx`"" -Wait | Out-Null 2> $null +Start-Process -FilePath "$tempDir\directx.exe" -WindowStyle Hidden -ArgumentList "/q /c /t:`"$tempDir\directx`"" -Wait 2>&1 | Out-Null Write-Host "Installing legacy DirectX runtimes..." -Start-Process -FilePath "$tempDir\directx\dxsetup.exe" -WindowStyle Hidden -ArgumentList '/silent' -Wait | Out-Null 2> $null +Start-Process -FilePath "$tempDir\directx\dxsetup.exe" -WindowStyle Hidden -ArgumentList '/silent' -Wait 2>&1 | Out-Null # Remove temporary directory -Remove-Item -Path $tempDir -Force -Recurse *>$null \ No newline at end of file +Remove-Item -Path $tempDir -Force -Recurse *>$null From 2db3fa5ef1973286320c041a9f7864e7039f903c Mon Sep 17 00:00:00 2001 From: Xyueta <101590573+Xyueta@users.noreply.github.com> Date: Thu, 19 Oct 2023 23:39:18 +0200 Subject: [PATCH 5/5] Update Uninstall-MsiexecAppByName.psm1 --- .../Uninstall-MsiexecAppByName.psm1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/playbook/Executables/AtlasModules/Scripts/Modules/Uninstall-MsiexecAppByName/Uninstall-MsiexecAppByName.psm1 b/src/playbook/Executables/AtlasModules/Scripts/Modules/Uninstall-MsiexecAppByName/Uninstall-MsiexecAppByName.psm1 index 0a8efb58b1..d0bb46591a 100644 --- a/src/playbook/Executables/AtlasModules/Scripts/Modules/Uninstall-MsiexecAppByName/Uninstall-MsiexecAppByName.psm1 +++ b/src/playbook/Executables/AtlasModules/Scripts/Modules/Uninstall-MsiexecAppByName/Uninstall-MsiexecAppByName.psm1 @@ -36,7 +36,7 @@ function Uninstall-MsiexecAppByName { if ($uninstallString -like "*MsiExec.exe*") { $foundKey = $key | Split-Path -Leaf Write-Warning "Uninstalling $displayName..." - Start-Process -FilePath "msiexec.exe" -ArgumentList "/qn /X$foundKey REBOOT=ReallySuppress /norestart" | Out-Null 2> $null + Start-Process -FilePath "msiexec.exe" -ArgumentList "/qn /X$foundKey REBOOT=ReallySuppress /norestart" 2>&1 | Out-Null } } } @@ -46,4 +46,4 @@ function Uninstall-MsiexecAppByName { } } -Export-ModuleMember -Function Uninstall-MsiexecAppByName \ No newline at end of file +Export-ModuleMember -Function Uninstall-MsiexecAppByName