starred/yaak-mountain-loop
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-05-13 11:20:12 +02:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

cli: inline cwd plugins resolver

Browse Source
This commit is contained in:
Gregory Schier
2026-02-26 09:22:54 -08:00
parent 9c09e32a56
commit 23e9cbb376
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
crates-cli/yaak-cli/src/context.rs
View File

@@ -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(); return embedded_vendored_plugin_dir.to_path_buf();
} }
resolve_workspace_plugins_dir_from_cwd() let plugins_dir = match std::env::current_dir() {
.unwrap_or_else(|| embedded_vendored_plugin_dir.to_path_buf()) 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() { 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)
} }