mirror of
https://github.com/mountain-loop/yaak.git
synced 2026-03-21 00:49:45 +01:00
cli: inline cwd plugins resolver
This commit is contained in:
@@ -140,15 +140,14 @@ fn resolve_bundled_plugin_dir_for_cli(embedded_vendored_plugin_dir: &Path) -> Pa
|
||||
return embedded_vendored_plugin_dir.to_path_buf();
|
||||
}
|
||||
|
||||
resolve_workspace_plugins_dir_from_cwd()
|
||||
.unwrap_or_else(|| embedded_vendored_plugin_dir.to_path_buf())
|
||||
}
|
||||
let plugins_dir = match std::env::current_dir() {
|
||||
Ok(cwd) => cwd.join("plugins"),
|
||||
Err(_) => return embedded_vendored_plugin_dir.to_path_buf(),
|
||||
};
|
||||
|
||||
fn resolve_workspace_plugins_dir_from_cwd() -> Option<PathBuf> {
|
||||
let plugins_dir = std::env::current_dir().ok()?.join("plugins");
|
||||
if !plugins_dir.is_dir() {
|
||||
return None;
|
||||
return embedded_vendored_plugin_dir.to_path_buf();
|
||||
}
|
||||
|
||||
plugins_dir.canonicalize().ok().or(Some(plugins_dir))
|
||||
plugins_dir.canonicalize().unwrap_or(plugins_dir)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user