From 7f14cdf208dde21b3615b68726ca5436a0fd6f25 Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Fri, 28 Jan 2022 00:08:16 +0100 Subject: [PATCH] [yabridgectl] Don't mention installation methods Unless the symlink-based installation method is enabled. --- CHANGELOG.md | 6 ++++++ tools/yabridgectl/src/actions.rs | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee717219..0c67be60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,12 @@ Versioning](https://semver.org/spec/v2.0.0.html). silence and hang afterwards (which a fix in yabridge 3.7.0 previously addressed). +### yabridgectl + +- `yabridgectl status` no longer mentions anything about installation methods if + you're using the normal, copy-based installation method. This is a follow-up + to the changes made in yabridgectl 3.8.0. + ## [3.8.0] - 2022-01-15 ### Added diff --git a/tools/yabridgectl/src/actions.rs b/tools/yabridgectl/src/actions.rs index 2fa8f066..2d015095 100644 --- a/tools/yabridgectl/src/actions.rs +++ b/tools/yabridgectl/src/actions.rs @@ -124,7 +124,7 @@ pub fn show_status(config: &Config) -> Result<()> { .unwrap_or_else(|| "".red().to_string()) ); println!( - "yabridge-host-32.exe: {}\n", + "yabridge-host-32.exe: {}", files .yabridge_host_32_exe .as_ref() @@ -134,10 +134,15 @@ pub fn show_status(config: &Config) -> Result<()> { ); } Err(err) => { - println!("Could not find yabridge's files: {}\n", err); + println!("Could not find yabridge's files: {}", err); } } - println!("installation method: {}", config.method); + + // Since the symlink-based installation method is deprecated, don't even mention installation + // methods if it's currently set to copies + if config.method != InstallationMethod::Copy { + println!("\ninstallation method: {}", config.method) + } for (path, search_results) in results { // Always print these paths with trailing slashes for consistency's sake because paths can