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] Expand libyabridge* auto detection

Browse Source 
There are no yabridge packages for Debian and Fedora based distros, but
we'll now also search through the paths used there.
This commit is contained in:
Robbert van der Helm
2021-02-06 21:09:30 +01:00
parent 391206eea8
commit c1b23b90a2
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/yabridgectl/src/config.rs
+16 -7
View File
@@ -216,15 +216,24 @@ impl Config {
}
}
None => {
// Search in the two common installation locations if no path was set explicitely.
// We'll also search through `/usr/local/lib` just in case but since we advocate
// against isntalling yabridge there we won't list this path in the error message
// when `libyabridge-vst2.so` can't be found.
// Search in the system library locations and in `~/.local/share/yabridge` if no
// path was set explicitely. We'll also search through `/usr/local/lib` just in case
// but since we advocate against installing yabridge there we won't list this path
// in the error message when `libyabridge-vst2.so` can't be found.
let system_path = Path::new("/usr/lib");
let system_path_alt = Path::new("/usr/local/lib");
let user_path = xdg_dirs.get_data_home();
let directories = [system_path, system_path_alt, &user_path];
let mut candidates = directories
let lib_directories = [
system_path,
// Used on Debian based distros
Path::new("/usr/lib/x86_64-linux-gnu"),
// Used on Fedora
Path::new("/usr/lib64"),
Path::new("/usr/local/lib"),
Path::new("/usr/local/lib/x86_64-linux-gnu"),
Path::new("/usr/local/lib64"),
&user_path,
];
let mut candidates = lib_directories
.iter()
.map(|directory| directory.join(LIBYABRIDGE_VST2_NAME));
match candidates.find(|directory| directory.exists()) {