From 1bc7aac7805285cea9ef6dc8adcaabf87a18ce67 Mon Sep 17 00:00:00 2001 From: Michael Davis Date: Tue, 16 Jan 2024 14:00:06 -0500 Subject: Use helix-stdx tilde expansion and normalization for HELIX_RUNTIME paths Previously this wasn't possible since helix-core depends on helix-loader, so helix-loader couldn't use helix-core's path extensions. We use the path normalization/canonicalization for the runtime directory provided by the HELIX_RUNTIME environment variable. This improves a scenario where you set a path containing a tilde. Now that path will be expanded and normalized. --- helix-loader/src/lib.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'helix-loader/src') diff --git a/helix-loader/src/lib.rs b/helix-loader/src/lib.rs index 991504fb..f8fac670 100644 --- a/helix-loader/src/lib.rs +++ b/helix-loader/src/lib.rs @@ -53,7 +53,8 @@ fn prioritize_runtime_dirs() -> Vec { rt_dirs.push(conf_rt_dir); if let Ok(dir) = std::env::var("HELIX_RUNTIME") { - rt_dirs.push(dir.into()); + let dir = path::expand_tilde(dir); + rt_dirs.push(path::normalize(dir)); } // If this variable is set during build time, it will always be included -- cgit v1.2.3-70-g09d2