Skip to content

Commit

Permalink
10.1.2 (#162)
Browse files Browse the repository at this point in the history
* Closes #150 please disable distrobox by default (#151)

* Check if distrobox exists before running step

* Improve help prompt value names (#153)

* 159 self update error message with standalone versions (#161)

* Rename back to topgrade

* Bugfix Version bump

* Changes reference to topgrade-rs in self-update

* Fixes distrobox errors (#160)

* Rename back to topgrade

* Bugfix Version bump

* Check if distrobox exists before running step

* Fixed sitrobox and version bump

* Version bump to 10.1.2

Co-authored-by: Marcin Puc <tranzystorek.io@protonmail.com>
  • Loading branch information
s34m and tranzystorekk authored Nov 6, 2022
1 parent 318f935 commit e161d3c
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ categories = ["os"]
keywords = ["upgrade", "update"]
license-file = "LICENSE"
repository = "https://github.com/topgrade-rs/topgrade"
version = "10.1.0"
version = "10.1.2"
authors = ["Roey Darwish Dror <roey.ghost@gmail.com>", "Thomas Schönauer <t.schoenauer@hgs-wt.at>"]
exclude = ["doc/screenshot.gif"]
edition = "2021"
Expand Down
21 changes: 14 additions & 7 deletions src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -424,19 +424,19 @@ pub struct CommandLineArgs {
no_retry: bool,

/// Do not perform upgrades for the given steps
#[clap(long = "disable", arg_enum, multiple_values = true)]
#[clap(long = "disable", value_name = "STEP", arg_enum, multiple_values = true)]
disable: Vec<Step>,

/// Perform only the specified steps (experimental)
#[clap(long = "only", arg_enum, multiple_values = true)]
#[clap(long = "only", value_name = "STEP", arg_enum, multiple_values = true)]
only: Vec<Step>,

/// Run only specific custom commands
#[clap(long = "custom-commands")]
#[clap(long = "custom-commands", value_name = "NAME", multiple_values = true)]
custom_commands: Vec<String>,

/// Set environment variables
#[clap(long = "env", multiple_values = true)]
#[clap(long = "env", value_name = "NAME=VALUE", multiple_values = true)]
env: Vec<String>,

/// Output logs
Expand All @@ -452,19 +452,26 @@ pub struct CommandLineArgs {
skip_notify: bool,

/// Say yes to package manager's prompt
#[clap(short = 'y', long = "yes", arg_enum, multiple_values = true, min_values = 0)]
#[clap(
short = 'y',
long = "yes",
value_name = "STEP",
arg_enum,
multiple_values = true,
min_values = 0
)]
yes: Option<Vec<Step>>,

/// Don't pull the predefined git repos
#[clap(long = "disable-predefined-git-repos")]
disable_predefined_git_repos: bool,

/// Alternative configuration file
#[clap(long = "config")]
#[clap(long = "config", value_name = "PATH")]
config: Option<PathBuf>,

/// A regular expression for restricting remote host execution
#[clap(long = "remote-host-limit")]
#[clap(long = "remote-host-limit", value_name = "REGEX")]
remote_host_limit: Option<Regex>,

/// Show the reason for skipped steps
Expand Down
6 changes: 1 addition & 5 deletions src/self_update.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,7 @@ pub fn self_update() -> Result<()> {
.repo_owner("topgrade-rs")
.repo_name("topgrade")
.target(target)
.bin_name(if cfg!(windows) {
"topgrade-rs.exe"
} else {
"topgrade-rs"
})
.bin_name(if cfg!(windows) { "topgrade.exe" } else { "topgrade" })
.show_output(false)
.show_download_progress(true)
.current_version(self_update_crate::cargo_crate_version!())
Expand Down
3 changes: 2 additions & 1 deletion src/steps/os/linux.rs
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,8 @@ pub fn run_distrobox_update(ctx: &ExecutionContext) -> Result<()> {
(r, true) => r.arg("--root"),
(r, false) => r,
}
.check_run()
.check_run()?;
Ok(())
}

pub fn run_config_update(ctx: &ExecutionContext) -> Result<()> {
Expand Down

0 comments on commit e161d3c

Please sign in to comment.