vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-05-07 03:50:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

[yabridgectl] Update Wine error detection

Browse Source 
The usage string has changed, better to just match part of it so this
won't cause issues again in the future.
This commit is contained in:
Robbert van der Helm
2020-10-26 17:54:41 +01:00
parent e067bbbfbc
commit 816a2cbe01
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/yabridgectl/src/utils.rs
+4 -4
View File
@@ -31,9 +31,9 @@ use textwrap::Wrapper;
use crate::config::{Config, KnownConfig}; use crate::config::{Config, KnownConfig};
/// (Part of) the expected output when running `yabridge-host.exe`. Used to verify that everything's /// (Part of) the expected output when running `yabridge-host.exe`. Used to verify that everything's
/// working correctly. /// working correctly. We'll only match this prefix so we can modify the exact output at a later
const YABRIDGE_HOST_EXPECTED_OUTPUT: &str = /// moment without causing issues.
"Usage: yabridge-host.exe <vst_plugin_dll> <unix_domain_socket>"; const YABRIDGE_HOST_EXPECTED_OUTPUT_PREFIX: &str = "Usage: yabridge-";
/// Wrapper around [`std::fs::copy()`](std::fs::copy) with a human readable error message. /// Wrapper around [`std::fs::copy()`](std::fs::copy) with a human readable error message.
pub fn copy<P: AsRef<Path>, Q: AsRef<Path>>(from: P, to: Q) -> Result<u64> { pub fn copy<P: AsRef<Path>, Q: AsRef<Path>>(from: P, to: Q) -> Result<u64> {
@@ -220,7 +220,7 @@ pub fn verify_wine_setup(config: &mut Config) -> Result<()> {
let mut success = false; let mut success = false;
let mut last_error: Option<&str> = None; let mut last_error: Option<&str> = None;
for line in stderr.lines() { for line in stderr.lines() {
if line == YABRIDGE_HOST_EXPECTED_OUTPUT { if line.starts_with(YABRIDGE_HOST_EXPECTED_OUTPUT_PREFIX) {
success = true; success = true;
break; break;
} }