From e091bc3ba2c241dca8ca77d4d620af7759817fcc Mon Sep 17 00:00:00 2001 From: Johannes Altmanninger Date: Mon, 27 Oct 2025 11:48:24 +0100 Subject: [PATCH] config_paths: rename "base_path" to "prefix" This matches the convention used by Make/CMake and others. --- src/env/config_paths.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/env/config_paths.rs b/src/env/config_paths.rs index e0e4d996f..d0a11114a 100644 --- a/src/env/config_paths.rs +++ b/src/env/config_paths.rs @@ -121,14 +121,14 @@ fn from_exec_path(unresolved_exec_path: &FishPath) -> Self { // The next check is that we are in a relocatable directory tree if exec_path_parent.ends_with("bin") { - let base_path = exec_path_parent.parent().unwrap(); - let data = base_path.join("share/fish"); - let sysconf = base_path.join("etc/fish"); - if base_path != workspace_root // Install to repo root is not supported. + let prefix = exec_path_parent.parent().unwrap(); + let data = prefix.join("share/fish"); + let sysconf = prefix.join("etc/fish"); + if prefix != workspace_root // Install to repo root is not supported. && data.exists() && sysconf.exists() { FLOG!(config, "Running from relocatable tree"); - let doc = base_path.join("share/doc/fish"); + let doc = prefix.join("share/doc/fish"); return Self { sysconf, bin: Some(exec_path_parent.to_owned()),