* Remove msupdate (fix #698) * Unused imports
This commit is contained in:
committed by
GitHub
parent
8c6a48af76
commit
3e9bd9bc0f
@@ -88,7 +88,6 @@ pub enum Step {
|
|||||||
MacPorts,
|
MacPorts,
|
||||||
Mas,
|
Mas,
|
||||||
Micro,
|
Micro,
|
||||||
MicrosoftAutoUpdate,
|
|
||||||
Myrepos,
|
Myrepos,
|
||||||
Nix,
|
Nix,
|
||||||
Node,
|
Node,
|
||||||
|
|||||||
@@ -164,9 +164,6 @@ fn run() -> Result<()> {
|
|||||||
unix::run_brew_cask(&ctx, unix::BrewVariant::MacIntel)
|
unix::run_brew_cask(&ctx, unix::BrewVariant::MacIntel)
|
||||||
})?;
|
})?;
|
||||||
runner.execute(Step::MacPorts, "MacPorts", || macos::run_macports(&ctx))?;
|
runner.execute(Step::MacPorts, "MacPorts", || macos::run_macports(&ctx))?;
|
||||||
runner.execute(Step::MicrosoftAutoUpdate, "Microsoft AutoUpdate", || {
|
|
||||||
macos::run_msupdate(&ctx)
|
|
||||||
})?;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(unix)]
|
#[cfg(unix)]
|
||||||
|
|||||||
@@ -1,25 +1,10 @@
|
|||||||
use crate::execution_context::ExecutionContext;
|
use crate::execution_context::ExecutionContext;
|
||||||
use crate::executor::RunType;
|
use crate::executor::RunType;
|
||||||
use crate::terminal::{print_separator, prompt_yesno};
|
use crate::terminal::{print_separator, prompt_yesno};
|
||||||
use crate::{
|
use crate::{error::TopgradeError, utils::require};
|
||||||
error::TopgradeError,
|
|
||||||
utils::{require, PathExt},
|
|
||||||
};
|
|
||||||
use anyhow::Result;
|
use anyhow::Result;
|
||||||
use log::debug;
|
use log::debug;
|
||||||
use std::{path::Path, process::Command};
|
use std::process::Command;
|
||||||
|
|
||||||
pub fn run_msupdate(ctx: &ExecutionContext) -> Result<()> {
|
|
||||||
let msupdate =
|
|
||||||
Path::new("/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate")
|
|
||||||
.require()?;
|
|
||||||
print_separator("Microsoft AutoUpdate");
|
|
||||||
|
|
||||||
ctx.run_type().execute(msupdate).arg("--list").spawn()?.wait()?;
|
|
||||||
ctx.run_type().execute(msupdate).arg("--install").spawn()?.wait()?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn run_macports(ctx: &ExecutionContext) -> Result<()> {
|
pub fn run_macports(ctx: &ExecutionContext) -> Result<()> {
|
||||||
require("port")?;
|
require("port")?;
|
||||||
|
|||||||
Reference in New Issue
Block a user