[yabridgectl] Don't panic on empty wine --version

And print a more descriptive error message instead. This is only
relevant when using a `WINELOADER` that causes `$WINELOADER --version`
to not output anything.
This commit is contained in:
Robbert van der Helm
2021-06-16 13:09:20 +02:00
parent 4c009cb670
commit eb9c2d9bf9
2 changed files with 10 additions and 1 deletions
+4
View File
@@ -49,6 +49,10 @@ Versioning](https://semver.org/spec/v2.0.0.html).
when supported by the file system. This speeds up the file coyping process when supported by the file system. This speeds up the file coyping process
while also reducing the amount of disk space used for yabridge when using while also reducing the amount of disk space used for yabridge when using
Btrfs or XFS. Btrfs or XFS.
- Print a more descriptive error message instead of panicing if running
`$WINELOADER --version` during yabridgectl's post-setup verification checks
does not result in any output. This is only relevant when using a custom
`WINELOADER` script that modifies Wine's output.
## [3.3.1] - 2021-06-09 ## [3.3.1] - 2021-06-09
+6 -1
View File
@@ -262,7 +262,12 @@ pub fn verify_wine_setup(config: &mut Config) -> Result<()> {
.stdout; .stdout;
// Strip the trailing newline just to make the config file a bit neater // Strip the trailing newline just to make the config file a bit neater
let mut wine_version = String::from_utf8(wine_version_output)?; let mut wine_version = String::from_utf8(wine_version_output)?;
wine_version.pop().unwrap(); wine_version.pop().with_context(|| {
format!(
"Running '{} --version' resulted in empty output",
wine_binary
)
})?;
let files = config let files = config
.files() .files()