From 784593df5ca021dac91b1af52870ff688e5450e4 Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Wed, 14 Jul 2021 15:10:03 +0200 Subject: [PATCH] [yabridgectl] Remove explicit fallback This was already handled by appending this to the `$PATH`. --- tools/yabridgectl/src/config.rs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tools/yabridgectl/src/config.rs b/tools/yabridgectl/src/config.rs index f0fe1d82..bc5ccfc4 100644 --- a/tools/yabridgectl/src/config.rs +++ b/tools/yabridgectl/src/config.rs @@ -287,16 +287,12 @@ impl Config { }; // `yabridge-host.exe` should either be in the search path, or it should be in - // `~/.local/share/yabridge` - let yabridge_host_exe = which(YABRIDGE_HOST_EXE_NAME) - .ok() - .or_else(|| xdg_dirs.find_data_file(YABRIDGE_HOST_EXE_NAME)); + // `~/.local/share/yabridge` (which was appended to the `$PATH` at the start of `main()`) + let yabridge_host_exe = which(YABRIDGE_HOST_EXE_NAME).ok(); let yabridge_host_exe_so = yabridge_host_exe .as_ref() .map(|path| path.with_extension("exe.so")); - let yabridge_host_32_exe = which(YABRIDGE_HOST_32_EXE_NAME) - .ok() - .or_else(|| xdg_dirs.find_data_file(YABRIDGE_HOST_32_EXE_NAME)); + let yabridge_host_32_exe = which(YABRIDGE_HOST_32_EXE_NAME).ok(); let yabridge_host_32_exe_so = yabridge_host_32_exe .as_ref() .map(|path| path.with_extension("exe.so"));