diff --git a/BREAKINGCHANGES_dev.md b/BREAKINGCHANGES_dev.md index e69de29b..1ecdf63a 100644 --- a/BREAKINGCHANGES_dev.md +++ b/BREAKINGCHANGES_dev.md @@ -0,0 +1,4 @@ +# Configutation + +1. The `enable_winget` configuration entry in the `windows` section has been +removed because it will not cause any issues and will be enabled by default. diff --git a/config.example.toml b/config.example.toml index b9d44428..72197327 100644 --- a/config.example.toml +++ b/config.example.toml @@ -184,9 +184,6 @@ # manager such as Scoop or Cargo # self_rename = true -# Enable WinGet upgrade -# enable_winget = true - [npm] # Use sudo if the NPM directory isn't owned by the current user diff --git a/src/config.rs b/src/config.rs index 4f91fd17..c7b62cd2 100644 --- a/src/config.rs +++ b/src/config.rs @@ -198,7 +198,6 @@ pub struct Windows { accept_all_updates: Option, self_rename: Option, open_remotes_in_new_terminal: Option, - enable_winget: Option, wsl_update_pre_release: Option, wsl_update_use_web_download: Option, } @@ -1446,16 +1445,6 @@ impl Config { true } - #[cfg(windows)] - pub fn enable_winget(&self) -> bool { - return self - .config_file - .windows - .as_ref() - .and_then(|w| w.enable_winget) - .unwrap_or(false); - } - pub fn enable_pipupgrade(&self) -> bool { return self .config_file diff --git a/src/steps/os/windows.rs b/src/steps/os/windows.rs index 2b5054c3..b63260be 100644 --- a/src/steps/os/windows.rs +++ b/src/steps/os/windows.rs @@ -8,7 +8,7 @@ use tracing::debug; use crate::command::CommandExt; use crate::execution_context::ExecutionContext; -use crate::terminal::{print_separator, print_warning}; +use crate::terminal::print_separator; use crate::utils::{require, which}; use crate::{error::SkipStep, steps::git::Repositories}; use crate::{powershell, Step}; @@ -42,11 +42,6 @@ pub fn run_winget(ctx: &ExecutionContext) -> Result<()> { print_separator("winget"); - if !ctx.config().enable_winget() { - print_warning("Winget is disabled by default. Enable it by setting enable_winget=true in the [windows] section in the configuration."); - return Err(SkipStep(String::from("Winget is disabled by default")).into()); - } - ctx.run_type() .execute(winget) .args(["upgrade", "--all"])