h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-04 15:51:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

config_paths: rename "base_path" to "prefix"

Browse Source 
This matches the convention used by Make/CMake and others.
This commit is contained in:
Johannes Altmanninger
2025-10-27 11:48:24 +01:00
parent 4f9c9b5be4
commit e091bc3ba2
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/env/config_paths.rs vendored
View File

@@ -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()),