Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/usoclient #669

Merged
merged 7 commits into from
Jan 29, 2024
Merged

Fix/usoclient #669

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
43a4d32
cargo update
niStee Jan 27, 2024
e1ef2e4
Implementing a check for Windows 11 and, if detected, skipping Window…
niStee Jan 27, 2024
78f3cd5
Merge branch 'main' into fix/usoclient
niStee Jan 28, 2024
7f5ec3d
Revert "cargo update"
niStee Jan 28, 2024
ed22bf0
Revert "Implementing a check for Windows 11 and, if detected, skippin…
niStee Jan 28, 2024
c6fddf1
Removed the usoclient step and added an error message.
niStee Jan 28, 2024
df2f825
cargo fmt
niStee Jan 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions src/steps/os/windows.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,18 +209,14 @@ pub fn windows_update(ctx: &ExecutionContext) -> Result<()> {

if powershell.supports_windows_update() {
print_separator("Windows Update");
return powershell.windows_update(ctx);
powershell.windows_update(ctx)
} else {
Err(SkipStep(
"Consider installing PSWindowsUpdate as the use of Windows Update via usoclient is not supported."
.to_string(),
)
.into())
}

let usoclient = require("UsoClient")?;

print_separator("Windows Update");
println!("Running Windows Update. Check the control panel for progress.");
ctx.run_type()
.execute(&usoclient)
.arg("ScanInstallWait")
.status_checked()?;
ctx.run_type().execute(&usoclient).arg("StartInstall").status_checked()
}

pub fn reboot() -> Result<()> {
Expand Down
Loading