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

Generic Blacklist implementation (#108)

Browse Source
This commit is contained in:
Edvin Malinovskis
2019-01-16 08:51:43 +00:00
committed by Roey Darwish Dror
parent 198009c48a
commit bfcfe5b3fa
3 changed files with 67 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main.rs
View File

@@ -9,7 +9,7 @@ mod steps;
mod terminal;
mod utils;
use self::config::Config;
use self::config::{Config, Step};
use self::error::{Error, ErrorKind};
use self::report::Report;
use self::steps::*;
@@ -101,7 +101,7 @@ fn run() -> Result<(), Error> {
#[cfg(target_os = "linux")]
{
if !opt.no_system {
if !opt.disable.contains(&Step::System) {
match &distribution {
Ok(distribution) => {
report.push_result(execute(
@@ -130,11 +130,11 @@ fn run() -> Result<(), Error> {
#[cfg(unix)]
report.push_result(execute(|| unix::run_nix(run_type), opt.no_retry)?);
if !opt.no_emacs {
if !opt.disable.contains(&Step::Emacs) {
git_repos.insert(base_dirs.home_dir().join(".emacs.d"));
}
if !opt.no_vim {
if !opt.disable.contains(&Step::Vim) {
git_repos.insert(base_dirs.home_dir().join(".vim"));
git_repos.insert(base_dirs.home_dir().join(".config/nvim"));
}
@@ -155,7 +155,7 @@ fn run() -> Result<(), Error> {
}
}
if !opt.no_git_repos {
if !opt.disable.contains(&Step::GitRepos) {
if let Some(custom_git_repos) = config.git_repos() {
for git_repo in custom_git_repos {
git_repos.insert(git_repo);
@@ -176,7 +176,7 @@ fn run() -> Result<(), Error> {
report.push_result(execute(|| generic::run_rustup(&base_dirs, run_type), opt.no_retry)?);
report.push_result(execute(|| generic::run_cargo_update(run_type), opt.no_retry)?);
if !opt.no_emacs {
if !opt.disable.contains(&Step::Emacs) {
report.push_result(execute(|| generic::run_emacs(&base_dirs, run_type), opt.no_retry)?);
}
@@ -185,7 +185,7 @@ fn run() -> Result<(), Error> {
report.push_result(execute(|| generic::run_pipx_update(run_type), opt.no_retry)?);
report.push_result(execute(|| generic::run_jetpack(run_type), opt.no_retry)?);
if !opt.no_vim {
if !opt.disable.contains(&Step::Vim) {
report.push_result(execute(|| vim::upgrade_vim(&base_dirs, run_type), opt.no_retry)?);
report.push_result(execute(|| vim::upgrade_neovim(&base_dirs, run_type), opt.no_retry)?);
}
@@ -205,7 +205,7 @@ fn run() -> Result<(), Error> {
)))]
report.push_result(execute(|| generic::run_apm(run_type), opt.no_retry)?);
if !opt.no_gem {
if !opt.disable.contains(&Step::Gem) {
report.push_result(execute(|| generic::run_gem(&base_dirs, run_type), opt.no_retry)?);
}
@@ -233,21 +233,21 @@ fn run() -> Result<(), Error> {
#[cfg(target_os = "macos")]
{
if !opt.no_system {
if !opt.disable.contains(&Step::System) {
report.push_result(execute(|| macos::upgrade_macos(run_type), opt.no_retry)?);
}
}
#[cfg(target_os = "freebsd")]
{
if !opt.no_system {
if !opt.disable.contains(&Step::System) {
report.push_result(execute(|| freebsd::upgrade_freebsd(&sudo, run_type), opt.no_retry)?);
}
}
#[cfg(windows)]
{
if !opt.no_system {
if !opt.disable.contains(&Step::System) {
report.push_result(execute(|| powershell.windows_update(run_type), opt.no_retry)?);
}
}