Do not download self update if it is the same version #576
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sdankel
reviewed
Feb 19, 2024
src/file.rs
Outdated
| @@ -9,6 +10,21 @@ pub(crate) fn is_executable(file: &Path) -> bool { | |||
| file.is_file() && file.metadata().unwrap().permissions().mode() & 0o111 != 0 | |||
| } | |||
|
|
|||
| pub(crate) fn get_bin_version(exec_path: &Path) -> Option<Version> { | |||
crodas
force-pushed
the
improve-self-update
branch
4 times, most recently
from
5ac35f5
to
1ddd7ad
Compare
sdankel
reviewed
Feb 21, 2024
|
|
||
| #[cfg(unix)] | ||
| pub(crate) fn is_executable(file: &Path) -> bool { | ||
| file.is_file() && file.metadata().unwrap().permissions().mode() & 0o111 != 0 | ||
| } | ||
|
|
||
| #[derive(Debug, thiserror::Error)] | ||
| pub(crate) enum BinError { |
src/ops/fuelup_check.rs
Outdated
| info!("{:>4}- {} - Error getting version string", "", plugin); | ||
| } | ||
| }; | ||
| match get_bin_version(plugin_executable) { |
There was a problem hiding this comment.
nit: we can make it even shorter! This function never returns an error, so doesn't need to return an empty result.
fn check_plugin(plugin_executable: &Path, plugin: &str, latest_version: &Version) {
let version_or_err = match get_bin_version(plugin_executable) {
Ok(version) => format_version_comparison(&version, latest_version),
Err(err) => err.to_string()
};
info!("{:>4}- {} - {}", "", plugin, version_or_err);
}
src/ops/fuelup_check.rs
Outdated
Comment on lines
113
to
130
| match get_bin_version(&component_executable) { | ||
| Ok(version) => { | ||
| info!( | ||
| "{:>2}{} - {}", | ||
| "", | ||
| bold(&component.name), | ||
| format_version_comparison(&version, latest_version) | ||
| ); | ||
| } | ||
| Err(_) => error!( | ||
| "{:>2}{} - Error getting version string", | ||
| "", | ||
| bold(&component.name) | ||
| ), | ||
| }; | ||
|
|
||
| Err(e) => { | ||
| error!( | ||
| "{:>2}{} - Error getting version string: {}", | ||
| "", | ||
| bold(&component.name), | ||
| e.to_string() | ||
| ); | ||
| } | ||
| } |
There was a problem hiding this comment.
Same thing here:
let version_text = match get_bin_version(&component_executable) {
Ok(version) => format_version_comparison(&version, latest_version),
Err(err) => err.to_string(),
};
info!("{:>2}{} - {}", "", bold(&component.name), version_text);
Co-authored-by: Sophie Dankel <[email protected]>
crodas
force-pushed
the
improve-self-update
branch
from
2e1dc98
to
7fe88ff
Compare
sdankel
approved these changes
Feb 21, 2024
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #555
After: