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

config_paths: disable the relocatable tree logic on Cargo builds

Browse Source 
This only makes sense for builds that install directories like
$PREFIX/share/fish, $PREFIX/etc/fish.
This commit is contained in:
Johannes Altmanninger
2025-11-23 10:07:25 +01:00
parent 3b100fce2d
commit 2ea3da4819
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/env/config_paths.rs vendored
View File

@@ -102,7 +102,7 @@ fn from_exec_path(unresolved_exec_path: &'static FishPath) -> Self {
let workspace_root = workspace_root();
// TODO(MSRV>=1.88): if-let-chain
if exec_path_parent.ends_with("bin") && {
if cfg!(using_cmake) && exec_path_parent.ends_with("bin") && {
let prefix = exec_path_parent.parent().unwrap();
let data = prefix.join("share/fish");
let sysconf = prefix.join("etc/fish");
@@ -112,6 +112,7 @@ fn from_exec_path(unresolved_exec_path: &'static FishPath) -> Self {
// Installing somewhere else inside the workspace is fine.
&& prefix != workspace_root
} {
const _: () = assert!(!cfg!(using_cmake) || DOC_DIR.is_some());
FLOG!(config, "Running from relocatable tree");
let prefix = exec_path_parent.parent().unwrap();
Self {
@@ -120,11 +121,11 @@ fn from_exec_path(unresolved_exec_path: &'static FishPath) -> Self {
data: Some(prefix.join("share/fish")),
doc: {
let doc = prefix.join("share/doc/fish");
if doc.exists() {
Some(doc)
Some(if doc.exists() {
doc
} else {
DOC_DIR.map(PathBuf::from)
}
PathBuf::from(DOC_DIR.unwrap())
})
},
}
} else if exec_path.starts_with(BUILD_DIR) {