admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move the package manager step to the beginning (fixes #19)

Browse Source
This commit is contained in:
Roey Darwish Dror
2018-06-11 08:29:40 +03:00
parent 246534f8c6
commit b54276863b
3 changed files with 53 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/main.rs
View File

@@ -84,6 +84,39 @@ fn main() -> Result<(), Error> {
let mut reports = Report::new();
let config = Config::read()?;
let sudo = if cfg!(target_os = "linux") {
which("sudo").ok()
} else {
None
};
if cfg!(target_os = "linux") {
terminal.print_separator("System update");
match linux::Distribution::detect() {
Ok(distribution) => {
match distribution {
linux::Distribution::Arch => upgrade_arch_linux(&sudo, &terminal),
linux::Distribution::CentOS => upgrade_redhat(&sudo, &terminal),
linux::Distribution::Fedora => upgrade_fedora(&sudo, &terminal),
linux::Distribution::Ubuntu | linux::Distribution::Debian => {
upgrade_debian(&sudo, &terminal)
}
}.report("System upgrade", &mut reports);
}
Err(e) => {
println!("Error detecting current distribution: {}", e);
}
}
}
if cfg!(target_os = "macos") {
if let Ok(brew) = which("brew") {
terminal.print_separator("Homebrew");
run_homebrew(&brew).report("Homebrew", &mut reports);
}
}
git_repos.insert(home_path(".emacs.d"));
if cfg!(unix) {
@@ -163,32 +196,12 @@ fn main() -> Result<(), Error> {
}
if cfg!(target_os = "linux") {
let sudo = which("sudo");
terminal.print_separator("System update");
match linux::Distribution::detect() {
Ok(distribution) => {
match distribution {
linux::Distribution::Arch => upgrade_arch_linux(&sudo, &terminal),
linux::Distribution::CentOS => upgrade_redhat(&sudo, &terminal),
linux::Distribution::Fedora => upgrade_fedora(&sudo, &terminal),
linux::Distribution::Ubuntu | linux::Distribution::Debian => {
upgrade_debian(&sudo, &terminal)
}
}.report("System upgrade", &mut reports);
}
Err(e) => {
println!("Error detecting current distribution: {}", e);
}
}
if let Ok(fwupdmgr) = which("fwupdmgr") {
terminal.print_separator("Firmware upgrades");
run_fwupdmgr(&fwupdmgr).report("Firmware upgrade", &mut reports);
}
if let Ok(sudo) = &sudo {
if let Some(sudo) = &sudo {
if let Ok(_) = which("needrestart") {
terminal.print_separator("Check for needed restarts");
run_needrestart(&sudo).report("Restarts", &mut reports);
@@ -197,13 +210,8 @@ fn main() -> Result<(), Error> {
}
if cfg!(target_os = "macos") {
if let Ok(brew) = which("brew") {
terminal.print_separator("Homebrew");
run_homebrew(&brew).report("Homebrew", &mut reports);
}
terminal.print_separator("System update");
upgrade_macos().report("System upgrade", &mut reports);;
terminal.print_separator("App Store");
upgrade_macos().report("App Store", &mut reports);;
}
if let Some(commands) = config.commands() {