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

config_paths: extract variable

Browse Source
This commit is contained in:
Johannes Altmanninger
2025-09-06 22:43:42 +02:00
parent a2c6e22d13
commit 75cedd8039
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

@@ -101,6 +101,9 @@ fn from_exec_path(unresolved_exec_path: PathBuf) -> Self {
let Ok(exec_path) = unresolved_exec_path.canonicalize() else {
return invalid_exec_path(unresolved_exec_path);
};
let Some(exec_path_parent) = exec_path.parent() else {
return invalid_exec_path(exec_path);
};
// If we're in Cargo's target directory or CMake's build directory, use the source files.
if exec_path.starts_with(env!("FISH_BUILD_DIR")) {
@@ -109,7 +112,7 @@ fn from_exec_path(unresolved_exec_path: PathBuf) -> Self {
kind: WorkspaceRoot,
paths: ConfigPaths {
sysconf: workspace_root.join("etc"),
bin: Some(exec_path.parent().unwrap().to_owned()),
bin: Some(exec_path_parent.to_owned()),
data: workspace_root.join("share"),
doc: workspace_root.join("user_doc/html"),
locale: workspace_root.join("share/locale"),
@@ -118,9 +121,6 @@ fn from_exec_path(unresolved_exec_path: PathBuf) -> Self {
};
}
let Some(exec_path_parent) = exec_path.parent() else {
return invalid_exec_path(exec_path);
};
// 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();
@@ -132,7 +132,7 @@ fn from_exec_path(unresolved_exec_path: PathBuf) -> Self {
kind: RelocatableTree,
paths: ConfigPaths {
sysconf,
bin: Some(base_path.join("bin")),
bin: Some(exec_path_parent.to_owned()),
data,
// The docs dir may not exist; in that case fall back to the compiled in path.
doc: if doc.exists() {